Merge branch 'upstream'

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