Merge remote branch 'mlc/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 19:31:42 +0000 (14:31 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 19:31:42 +0000 (14:31 -0500)

Trivial merge