Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:42:17 +0000 (08:42 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:42:17 +0000 (08:42 -0400)

Trivial merge