Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-03-01 01:58:38 -05:00
commit 68727fed54
93 changed files with 1435 additions and 1016 deletions