Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 20:12:58 +0000 (15:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 20:12:58 +0000 (15:12 -0500)

Trivial merge