This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.
Workaround the fact that Intel C++ for Linux #defines __GNUC__
merged from trunk
Fix up busted tag replacement
merged from trunk
This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.
VC7.1+ workaround :(
Merge fixes from the main trunk
merged from trunk