Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2005-12-13 22:22:50 -05:00
commit 36dfc3f67b
5 changed files with 43 additions and 4 deletions