Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Mon, 6 Mar 2006 19:38:16 +0000 (14:38 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 6 Mar 2006 19:38:16 +0000 (14:38 -0500)

Trivial merge