Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)

Trivial merge