Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:24:46 +0000 (15:24 -0400)

Trivial merge