Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 00:57:15 +0000 (19:57 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 00:57:15 +0000 (19:57 -0500)

Trivial merge