K 10
svn:author
V 5
guido
K 8
svn:date
V 27
2006-08-16T12:23:02.000000Z
K 7
svn:log
V 38
Resolve conflicts

MFC after:	1 weeks

END