Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:43 +0000 (16:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 20:54:43 +0000 (16:54 -0400)

Trivial merge