Merge branch 'master' into debian debian/0.2-1
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 15 Mar 2010 18:29:18 +0000 (14:29 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 15 Mar 2010 18:29:18 +0000 (14:29 -0400)

Trivial merge