Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 13 Feb 2006 05:12:09 +0000 (00:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 13 Feb 2006 05:12:09 +0000 (00:12 -0500)

Trivial merge