Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-02-09 04:30:18 -05:00
commit 389984cb75