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

[SVN r21427]
Workaround the fact that Intel C++ for Linux #defines __GNUC__


[SVN r21466]
merged from trunk


[SVN r21489]
Fix up busted tag replacement


[SVN r21500]
merged from trunk


[SVN r21502]
This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.

[SVN r21510]
VC7.1+ workaround :(


[SVN r21523]
Merge fixes from the main trunk


[SVN r21842]
merged from trunk


[SVN r21914]