This commit was manufactured by cvs2svn to create branch 'RC_1_30_0'.
revert cr->nl changes; not needed on this particular file
Fix facet support for intel-win32