Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-04-27 04:53:34 -04:00
commit acc696d93d
203 changed files with 4294 additions and 1960 deletions