Merge branch 'master'

This commit is contained in:
Jeff Garzik 2005-10-20 10:11:25 -04:00
commit 323cb3ce6e
42 changed files with 692 additions and 290 deletions