Merge remote branch 'mlc/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 21:27:05 +0000 (16:27 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Sat, 9 Jan 2010 21:27:05 +0000 (16:27 -0500)
1  2 
msva

diff --cc msva
Simple merge