K 10 svn:author V 3 imp K 8 svn:date V 27 2010-08-22T21:59:55.203817Z K 7 svn:log V 75 Merge gone wrong, trying to commit what I can before wiping and doing over END