Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 2 Feb 2006 06:12:54 +0000 (01:12 -0500)

Trivial merge