Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 3 Oct 2005 23:46:45 +0000 (19:46 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 3 Oct 2005 23:46:45 +0000 (19:46 -0400)

Trivial merge