Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2005-12-01 02:22:47 -05:00
commit e9022ee6c3
7 changed files with 55 additions and 1028 deletions