Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Wed, 1 Mar 2006 19:45:47 +0000 (14:45 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 1 Mar 2006 19:45:47 +0000 (14:45 -0500)

Trivial merge