Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 10 Feb 2006 15:30:02 +0000 (10:30 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 10 Feb 2006 15:30:02 +0000 (10:30 -0500)

Trivial merge