Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Mon, 24 Jul 2006 07:38:13 +0000 (03:38 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 24 Jul 2006 07:38:13 +0000 (03:38 -0400)

Trivial merge