Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2005-10-30 23:33:54 -05:00
commit c4811b151b
3 changed files with 18 additions and 51 deletions