Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 00:56:43 +0000 (20:56 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 00:56:43 +0000 (20:56 -0400)

Trivial merge