Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 16:00:06 +0000 (11:00 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 16:00:06 +0000 (11:00 -0500)

Trivial merge