Merge branch 'sundance'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 06:47:33 +0000 (01:47 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 06:47:33 +0000 (01:47 -0500)

Trivial merge