Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 20 Sep 2006 04:48:28 +0000 (00:48 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 20 Sep 2006 04:48:28 +0000 (00:48 -0400)

Trivial merge