Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:52:42 +0000 (21:52 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 19 Oct 2005 01:52:42 +0000 (21:52 -0400)

Trivial merge