Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-01-29 02:47:18 -05:00
commit b1d917739a