Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 4 Dec 2005 02:03:28 +0000 (21:03 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 4 Dec 2005 02:03:28 +0000 (21:03 -0500)

Trivial merge