Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2005-10-30 23:35:23 -05:00
commit cd8200e6d4
3 changed files with 17 additions and 50 deletions