Merge branch 'upstream' into max-sect

This commit is contained in:
Jeff Garzik 2006-04-27 04:55:26 -04:00
commit 9a375e93f8
567 changed files with 13931 additions and 7617 deletions