K 10 svn:author V 2 bf K 8 svn:date V 27 2012-06-09T04:55:58.000000Z K 7 svn:log V 70 add some CONFLICTS [1]; minor clean-up Reported by: S.-M. Silber [1] END