Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 21:52:52 +0000 (17:52 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 12 Apr 2006 21:52:52 +0000 (17:52 -0400)

Trivial merge