Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 6 May 2010 16:23:33 +0000 (12:23 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 6 May 2010 16:23:33 +0000 (12:23 -0400)

Trivial merge