K 10
svn:author
V 5
arved
K 8
svn:date
V 27
2008-01-04T15:56:14.000000Z
K 7
svn:log
V 88
Adjust conflicts

PR:		118860
Submitted by:	Anatoly Borodin <anatoly.borodin@gmail.com>

END