Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 22:50:09 +0000 (18:50 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 22:50:09 +0000 (18:50 -0400)

Trivial merge