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

Trivial merge