Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 4 Nov 2010 06:21:14 +0000 (02:21 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Thu, 4 Nov 2010 06:21:14 +0000 (02:21 -0400)

Trivial merge