Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:54:22 +0000 (23:54 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:54:22 +0000 (23:54 -0400)

Trivial merge