Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-05-20 00:03:38 -04:00
commit badc48e660
386 changed files with 7448 additions and 3231 deletions