Merge branch 'master' into HEAD
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 15 Jul 2010 23:21:48 +0000 (19:21 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 15 Jul 2010 23:21:48 +0000 (19:21 -0400)

Trivial merge