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

Trivial merge