Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2006-02-09 04:31:08 -05:00
commit 2ddd1023d2