Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-07-24 03:38:01 -04:00
commit e36fcd8ae6