K 10 svn:author V 5 peter K 8 svn:date V 27 2008-07-04T02:35:17.745070Z K 7 svn:log V 32 Fix some bizzare merge records. END