Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 16:09:39 +0000 (11:09 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 16:09:39 +0000 (11:09 -0500)

Trivial merge