Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 19 Dec 2005 05:09:53 +0000 (00:09 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 19 Dec 2005 05:09:53 +0000 (00:09 -0500)

Trivial merge