Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 3 Oct 2010 04:18:24 +0000 (00:18 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 3 Oct 2010 04:18:24 +0000 (00:18 -0400)

Trivial merge