Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Wed, 1 Mar 2006 06:58:38 +0000 (01:58 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 1 Mar 2006 06:58:38 +0000 (01:58 -0500)

Trivial merge