K 10
svn:author
V 6
rpaulo
K 8
svn:date
V 27
2008-08-27T22:51:20.826389Z
K 7
svn:log
V 55
Disable detect-merge-conflicts.sh.

Approved by:	peter

END