Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 19 Mar 2010 00:14:50 +0000 (20:14 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 19 Mar 2010 00:14:50 +0000 (20:14 -0400)

Trivial merge