Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:38:13 +0000 (15:38 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:38:13 +0000 (15:38 -0500)

Trivial merge