Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 10:15:47 +0000 (05:15 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 10:15:47 +0000 (05:15 -0500)

Trivial merge