K 10 svn:author V 5 erwin K 8 svn:date V 27 2015-02-09T03:20:51.517602Z K 7 svn:log V 38 Add conflicts with new softhsm2 port. END