Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 14 Nov 2010 08:28:09 +0000 (03:28 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 14 Nov 2010 08:28:09 +0000 (03:28 -0500)

Trivial merge