Merge branch 'upstream'

This commit is contained in:
Jeff Garzik 2006-04-02 11:38:12 -04:00
commit a808be8a12