Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 24 Jul 2006 07:40:11 +0000 (03:40 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 24 Jul 2006 07:40:11 +0000 (03:40 -0400)

Trivial merge