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

Trivial merge