merge r3054 from branch 2.0 to trunk
Code administration: convert all text files to Unix file format (CR as eol and not CRLF)