Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:39:35 +0000 (23:39 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 12 Nov 2005 04:39:35 +0000 (23:39 -0500)

Trivial merge