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

Trivial merge