Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 06:35:03 +0000 (01:35 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 9 Nov 2005 06:35:03 +0000 (01:35 -0500)

Trivial merge