Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 10 Mar 2010 07:43:32 +0000 (02:43 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 10 Mar 2010 07:43:32 +0000 (02:43 -0500)

Trivial merge