Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 13 Feb 2006 05:13:48 +0000 (00:13 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 13 Feb 2006 05:13:48 +0000 (00:13 -0500)

Trivial merge