Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 21:55:56 +0000 (16:55 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 21:55:56 +0000 (16:55 -0500)

Trivial merge