Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:46:38 +0000 (15:46 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:46:38 +0000 (15:46 -0400)

Trivial merge