Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Wed, 11 Oct 2006 07:56:12 +0000 (03:56 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 11 Oct 2006 07:56:12 +0000 (03:56 -0400)

Trivial merge