K 10
svn:author
V 7
laurent
K 8
svn:date
V 27
2011-08-19T17:50:10.671169Z
K 7
svn:log
V 21
resolve tree conflict
END