Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 8 Dec 2010 02:37:55 +0000 (21:37 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 8 Dec 2010 02:37:55 +0000 (21:37 -0500)

Trivial merge