Am Mon, den 27.10.2003 schrieb Petter Reinholdtsen um 23:44: > Please clean up the conflict you commited, and make it a habit to use > 'cvs diff -u' before you commit: Done, sorry about that gaudenz