Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 10:13:31 +0000 (05:13 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 10:13:31 +0000 (05:13 -0500)

Trivial merge