Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:42:15 +0000 (17:42 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:42:15 +0000 (17:42 -0400)

Trivial merge