Merge remote branch 'jrollins/master'
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 11 Jan 2010 15:46:07 +0000 (10:46 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 11 Jan 2010 15:46:07 +0000 (10:46 -0500)
1  2 
msva

diff --cc msva
Simple merge