Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 05:28:05 +0000 (01:28 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 05:28:05 +0000 (01:28 -0400)

Trivial merge