Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-05-26 21:33:55 -04:00
commit f29cb26c43