Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Mon, 7 Nov 2005 04:01:34 +0000 (23:01 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 7 Nov 2005 04:01:34 +0000 (23:01 -0500)

Trivial merge