Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 17 Nov 2005 01:45:40 +0000 (20:45 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 17 Nov 2005 01:45:40 +0000 (20:45 -0500)

Trivial merge