Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 27 Sep 2006 22:16:47 +0000 (18:16 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 27 Sep 2006 22:16:47 +0000 (18:16 -0400)

Trivial merge