Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2005-11-09 01:35:03 -05:00
commit fb2a26b9f8