Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 19 Mar 2010 00:02:49 +0000 (20:02 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 19 Mar 2010 00:02:49 +0000 (20:02 -0400)

Trivial merge