Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 05:59:34 +0000 (00:59 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 05:59:34 +0000 (00:59 -0500)

Trivial merge