Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-02-07 02:06:12 -05:00
commit 23a56e2cbe
13 changed files with 220 additions and 109 deletions