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

Trivial merge