Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-01-31 11:52:21 -05:00
commit a03b195052