Merge branch 'janitor'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 00:19:20 +0000 (19:19 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 00:19:20 +0000 (19:19 -0500)

Trivial merge