Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2005-12-06 04:52:48 -05:00
commit 701db69d66
12 changed files with 124 additions and 75 deletions