cherry-pick tfs10 dll change
additional vs2010 changes