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

Trivial merge