Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik 2006-07-29 04:01:23 -04:00
commit ab1623da2b
9 changed files with 44 additions and 18 deletions