Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 03:33:43 +0000 (22:33 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 03:33:43 +0000 (22:33 -0500)

Trivial merge