Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 14 Dec 2005 03:22:50 +0000 (22:22 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 14 Dec 2005 03:22:50 +0000 (22:22 -0500)

Trivial merge