Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:41:29 +0000 (08:41 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:41:29 +0000 (08:41 -0400)

Trivial merge