Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 11 Oct 2005 05:48:37 +0000 (01:48 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 11 Oct 2005 05:48:37 +0000 (01:48 -0400)

Trivial merge