Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:20:42 +0000 (02:20 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:20:42 +0000 (02:20 -0500)

Trivial merge