Merge branch 'upstream-fixes'

This commit is contained in:
Jeff Garzik 2006-03-11 19:55:37 -05:00
commit 2f7ccc51db
8 changed files with 62 additions and 43 deletions