Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 26 Oct 2005 05:06:45 +0000 (01:06 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 26 Oct 2005 05:06:45 +0000 (01:06 -0400)

Trivial merge