Merge remote branch 'jamie/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 21 Sep 2010 14:55:18 +0000 (10:55 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 21 Sep 2010 14:55:18 +0000 (10:55 -0400)

Trivial merge