Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 18:33:57 +0000 (14:33 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 18:33:57 +0000 (14:33 -0400)

Trivial merge