K 10 svn:author V 5 gabor K 8 svn:date V 27 2011-10-20T09:55:21.374851Z K 7 svn:log V 27 - Manual fixes after merge END