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

Trivial merge