Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2006-02-09 05:15:47 -05:00
commit a081975002
3 changed files with 724 additions and 674 deletions