revert merge
[fanfix.git] / tterminal / DisplayLine.java