Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Mon, 27 Feb 2006 16:33:51 +0000 (11:33 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 27 Feb 2006 16:33:51 +0000 (11:33 -0500)

Trivial merge