Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Fri, 24 Feb 2006 02:16:27 +0000 (21:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 24 Feb 2006 02:16:27 +0000 (21:16 -0500)

Trivial merge