Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 12 Dec 2005 20:24:45 +0000 (15:24 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 12 Dec 2005 20:24:45 +0000 (15:24 -0500)

Trivial merge