Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 8 Oct 2005 07:31:22 +0000 (03:31 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 8 Oct 2005 07:31:22 +0000 (03:31 -0400)

Trivial merge