Merge branch 'master' into debian
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 13 Mar 2010 20:21:00 +0000 (15:21 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 13 Mar 2010 20:21:00 +0000 (15:21 -0500)

Trivial merge