Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 01:32:31 +0000 (21:32 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 27 May 2006 01:32:31 +0000 (21:32 -0400)

Trivial merge