Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 01:56:07 +0000 (20:56 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 01:56:07 +0000 (20:56 -0500)

Trivial merge