Merge remote branch 'mlc/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 12 Jan 2010 07:48:06 +0000 (02:48 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Tue, 12 Jan 2010 07:48:06 +0000 (02:48 -0500)

Trivial merge