Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-03-11 19:10:06 -05:00
commit 75deb6fa98