Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:27:45 +0000 (17:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 20 Apr 2006 21:27:45 +0000 (17:27 -0400)

Trivial merge