Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 11 Feb 2006 23:02:04 +0000 (18:02 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 11 Feb 2006 23:02:04 +0000 (18:02 -0500)

Trivial merge