merge from mangoszero

Correct the File Version numbers in VC110 solution files so that VS2012
opens correctly on systems that have both VS2010 and VS2012 installed

(based on commit 5895b2b)