Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:18:49 +0000 (17:18 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:18:49 +0000 (17:18 -0500)

Trivial merge