Merge r1846 from trunk: Eliminate compiling failure on OpenSolaris.

SVN-Revision: 1847
1 file changed