Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 7 Oct 2010 04:47:51 +0000 (00:47 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 7 Oct 2010 04:47:51 +0000 (00:47 -0400)

Trivial merge