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

Trivial merge