Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-04-12 18:11:33 -04:00
commit 201e062798
13 changed files with 67 additions and 233 deletions