K 10
svn:author
V 4
fjoe
K 8
svn:date
V 27
2012-08-29T08:41:07.890330Z
K 7
svn:log
V 26
Fix CONFLICTS definition.

END