K 10 svn:author V 2 mi K 8 svn:date V 27 2010-12-03T05:15:39.000000Z K 7 svn:log V 66 Re-work the CONFLICTS line to avoid conflicting with ourselves... END