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)
commit03a49eebcaa3486f4ac2c50db83aab996ce5ad9b
treea92d8a6b3806ec3416ca2b28c45174fca9c4833e
parentd4fbeabbc9e68c80738fe59135d201c3ed5fe40f
parent26df54bffd90977fbc6fe8284f2beaed19fea44f
Merge branch 'janitor'