K 10
svn:author
V 3
des
K 8
svn:date
V 27
2006-11-10T16:52:41.000000Z
K 7
svn:log
V 19
Resolve conflicts.

END