Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 14 Dec 2005 03:15:52 +0000 (22:15 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 14 Dec 2005 03:15:52 +0000 (22:15 -0500)

Trivial merge