Merge pull request #949 from laanwj/2012_03_vc2010compilefixes