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

[SVN r17693]
revert cr->nl changes; not needed on this particular file


[SVN r17764]
Fix facet support for intel-win32


[SVN r19625]