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

[SVN r21427]
VC++ 7.1 /CLR workaround


[SVN r22241]
Work around GCC 2.95.3 bug trigged by VC++ 7.1 /CLR bug.


[SVN r22243]