Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 21:49:12 +0000 (17:49 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 21:49:12 +0000 (17:49 -0400)

Trivial merge