Merge branch 'master' into HEAD
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 20 Dec 2010 21:22:38 +0000 (16:22 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 20 Dec 2010 21:22:38 +0000 (16:22 -0500)

Trivial merge