Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 07:32:01 +0000 (02:32 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 13 Dec 2005 07:32:01 +0000 (02:32 -0500)

Trivial merge