Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Sat, 11 Mar 2006 18:35:31 +0000 (13:35 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 11 Mar 2006 18:35:31 +0000 (13:35 -0500)

Trivial merge