K 10
svn:author
V 4
maho
K 8
svn:date
V 27
2007-01-15T23:55:11.000000Z
K 7
svn:log
V 42
Fix CONFLICT line.

Submitted by:	thierry

END