Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 6 Dec 2005 09:12:02 +0000 (04:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 6 Dec 2005 09:12:02 +0000 (04:12 -0500)

Trivial merge