Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 23 Mar 2010 21:15:33 +0000 (17:15 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 23 Mar 2010 21:15:33 +0000 (17:15 -0400)

Trivial merge