Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:28:34 +0000 (17:28 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 3 Aug 2006 21:28:34 +0000 (17:28 -0400)

Trivial merge