Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 23 Mar 2010 20:47:40 +0000 (16:47 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 23 Mar 2010 20:47:40 +0000 (16:47 -0400)

Trivial merge