Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-07-29 00:32:42 -04:00
commit a47e920948
6 changed files with 29 additions and 9 deletions