Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 19 Nov 2005 00:55:06 +0000 (19:55 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 19 Nov 2005 00:55:06 +0000 (19:55 -0500)

Trivial merge