Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 31 Mar 2010 22:17:10 +0000 (18:17 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 31 Mar 2010 22:17:10 +0000 (18:17 -0400)

Trivial merge