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

[SVN r25797]
add portability check


[SVN r25917]