Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Wed, 22 Mar 2006 11:09:31 +0000 (06:09 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 22 Mar 2006 11:09:31 +0000 (06:09 -0500)

Trivial merge