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

Trivial merge