Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 19:26:21 +0000 (15:26 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 19:26:21 +0000 (15:26 -0400)

Trivial merge