Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 11 Sep 2006 13:05:33 +0000 (09:05 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 11 Sep 2006 13:05:33 +0000 (09:05 -0400)

Trivial merge