Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 10:54:37 +0000 (05:54 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 10:54:37 +0000 (05:54 -0500)

Trivial merge