Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:32:03 +0000 (23:32 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 31 Oct 2005 04:32:03 +0000 (23:32 -0500)

Trivial merge