Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:27:08 +0000 (19:27 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:27:08 +0000 (19:27 -0500)

Trivial merge