Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2005-11-15 14:25:12 -05:00
commit 68bdbdf0b3