Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 7 Aug 2006 10:43:17 +0000 (06:43 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 7 Aug 2006 10:43:17 +0000 (06:43 -0400)

Trivial merge