Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:52:21 +0000 (11:52 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 31 Jan 2006 16:52:21 +0000 (11:52 -0500)

Trivial merge