Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:27:05 +0000 (00:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:27:05 +0000 (00:27 -0400)

Trivial merge