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

Trivial merge