Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 20 Nov 2005 05:41:08 +0000 (00:41 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 20 Nov 2005 05:41:08 +0000 (00:41 -0500)

Trivial merge