Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 00:55:37 +0000 (19:55 -0500)
committerJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 00:55:37 +0000 (19:55 -0500)

Trivial merge