K 10
svn:author
V 4
miwi
K 8
svn:date
V 27
2010-12-30T06:24:10.000000Z
K 7
svn:log
V 69
- Update CONFLICT handling

Submitted by:	beat
Review by:	bcr, jkois

END