Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-05-24 01:28:05 -04:00
commit 75ac6ae818