K 10 svn:author V 3 imp K 8 svn:date V 27 2001-08-11T02:07:17.000000Z K 7 svn:log V 104 Strongly recommend using mergemaster and give some indication of what problems can happen if you don't. END