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

Trivial merge