Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 06:01:22 +0000 (01:01 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 06:01:22 +0000 (01:01 -0500)

Trivial merge