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

Trivial merge