Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2005-11-29 03:57:16 -05:00
commit 5e3c2b95dd