(PS: I have tried all three kinds of EOL, and HG always modifies the whole file. I really do not know what I can do with it.) --HG-- branch : trunk
*Also re-commit the patches reverted in 255. --HG-- branch : trunk