Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:49:18 +0000 (10:49 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 3 Jan 2006 15:49:18 +0000 (10:49 -0500)

Trivial merge