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

Trivial merge