Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 07:06:12 +0000 (02:06 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 07:06:12 +0000 (02:06 -0500)

Trivial merge