Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 16 Jun 2010 06:32:14 +0000 (02:32 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 16 Jun 2010 06:32:14 +0000 (02:32 -0400)

Trivial merge