Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 18 Apr 2010 00:35:20 +0000 (20:35 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 18 Apr 2010 00:35:20 +0000 (20:35 -0400)

Trivial merge