K 10
svn:author
V 4
kris
K 8
svn:date
V 27
2000-06-03T09:23:13.000000Z
K 7
svn:log
V 18
Resolve conflicts

END