Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 20:16:27 +0000 (15:16 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 20:16:27 +0000 (15:16 -0500)

Trivial merge