Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 20 Oct 2005 14:11:25 +0000 (10:11 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 20 Oct 2005 14:11:25 +0000 (10:11 -0400)

Trivial merge