Merge remote branch 'micah/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 7 Feb 2010 18:18:44 +0000 (13:18 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sun, 7 Feb 2010 18:18:44 +0000 (13:18 -0500)

Trivial merge