Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:28:36 +0000 (00:28 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 29 Jul 2006 04:28:36 +0000 (00:28 -0400)

Trivial merge