Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Mon, 6 Mar 2006 19:37:47 +0000 (14:37 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 6 Mar 2006 19:37:47 +0000 (14:37 -0500)

Trivial merge