Merge branch 'debian-0.1' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 9 Mar 2010 17:17:07 +0000 (12:17 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 9 Mar 2010 17:17:07 +0000 (12:17 -0500)

Trivial merge