Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:29:23 +0000 (08:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 10 Aug 2006 12:29:23 +0000 (08:29 -0400)

Trivial merge