Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:44:17 +0000 (11:44 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 18 Nov 2005 16:44:17 +0000 (11:44 -0500)

Trivial merge