Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 05:58:59 +0000 (00:58 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 05:58:59 +0000 (00:58 -0500)

Trivial merge