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

Trivial merge