Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:16 +0000 (03:57 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:16 +0000 (03:57 -0500)

Trivial merge