Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 24 Dec 2005 14:28:21 +0000 (09:28 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 24 Dec 2005 14:28:21 +0000 (09:28 -0500)

Trivial merge