Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-05-20 00:26:26 -04:00
commit 4e3ceac609
8 changed files with 131 additions and 302 deletions