K 10
svn:author
V 3
des
K 8
svn:date
V 27
2006-09-30T13:38:06.000000Z
K 7
svn:log
V 36
Merge conflicts.

MFC after:	1 week

END