Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 13 Nov 2010 23:40:31 +0000 (18:40 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 13 Nov 2010 23:40:31 +0000 (18:40 -0500)

Trivial merge