Merge remote branch 'mlc/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 22:39:37 +0000 (17:39 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 22:39:37 +0000 (17:39 -0500)

Trivial merge