Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 10 Feb 2006 12:09:37 +0000 (07:09 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 10 Feb 2006 12:09:37 +0000 (07:09 -0500)

Trivial merge