K 10
svn:author
V 5
arved
K 8
svn:date
V 27
2004-02-02T11:17:04.000000Z
K 7
svn:log
V 90
Add conflicts

PR:		62103
Submitted by:	Volker Stolz <stolz@i2.informatik.rwth-aachen.de>

END