Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 6 Jul 2006 17:07:32 +0000 (13:07 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 6 Jul 2006 17:07:32 +0000 (13:07 -0400)

Trivial merge