Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 21:17:31 +0000 (16:17 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 21:17:31 +0000 (16:17 -0500)

Trivial merge