Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 12 Oct 2010 07:50:48 +0000 (03:50 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 12 Oct 2010 07:50:48 +0000 (03:50 -0400)

Trivial merge