Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:06:45 +0000 (16:06 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:06:45 +0000 (16:06 -0500)

Trivial merge