Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:27:12 +0000 (17:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:27:12 +0000 (17:27 -0400)

Trivial merge