Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 14 Oct 2005 01:22:27 +0000 (21:22 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 14 Oct 2005 01:22:27 +0000 (21:22 -0400)

Trivial merge