Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 14:40:44 +0000 (10:40 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 14:40:44 +0000 (10:40 -0400)

Trivial merge