Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-07-29 01:29:27 -04:00
commit 053dd21789