Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2006-01-17 19:57:15 -05:00
commit 2baeaaa4da