Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 21:14:17 +0000 (17:14 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 18 Oct 2005 21:14:17 +0000 (17:14 -0400)

Trivial merge