Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 6 Jan 2010 02:38:31 +0000 (21:38 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Wed, 6 Jan 2010 02:38:31 +0000 (21:38 -0500)

Trivial merge