Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 14:33:02 +0000 (10:33 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 9 Oct 2005 14:33:02 +0000 (10:33 -0400)

Trivial merge