Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:51:15 +0000 (03:51 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 29 Nov 2005 08:51:15 +0000 (03:51 -0500)

Trivial merge