Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 07:16:23 +0000 (02:16 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 20 Feb 2006 07:16:23 +0000 (02:16 -0500)

Trivial merge