Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-02-17 16:20:30 -05:00
commit b04a92e160
436 changed files with 6439 additions and 4215 deletions