Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 02:39:31 +0000 (21:39 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 02:39:31 +0000 (21:39 -0500)

Trivial merge