Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 11 Feb 2006 22:51:46 +0000 (17:51 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 11 Feb 2006 22:51:46 +0000 (17:51 -0500)

Trivial merge