Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Fri, 31 Mar 2006 15:03:19 +0000 (10:03 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 31 Mar 2006 15:03:19 +0000 (10:03 -0500)

Trivial merge