K 10 svn:author V 6 rpaulo K 8 svn:date V 27 2008-08-27T19:47:48.324936Z K 7 svn:log V 69 Workaround the detect-merge-conflicts.sh script and 's/^======$/&='. END