This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.

[SVN r21427]
Unfix unversioned VC++ check again, VC 7.1 still needs it.


[SVN r22378]