Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 20 Nov 2005 05:40:19 +0000 (00:40 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 20 Nov 2005 05:40:19 +0000 (00:40 -0500)

Trivial merge