Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 14 Aug 2006 17:59:38 +0000 (13:59 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 14 Aug 2006 17:59:38 +0000 (13:59 -0400)

Trivial merge