Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-05-29 01:03:37 -04:00
commit 89f8185e9b
28 changed files with 720 additions and 662 deletions