Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 17 Nov 2005 16:16:39 +0000 (11:16 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 17 Nov 2005 16:16:39 +0000 (11:16 -0500)

Trivial merge