Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:58:18 +0000 (01:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 06:58:18 +0000 (01:58 -0500)

Trivial merge