Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:22:42 +0000 (19:22 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 17 Mar 2006 00:22:42 +0000 (19:22 -0500)

Trivial merge