K 10
svn:author
V 3
sam
K 8
svn:date
V 27
2008-03-24T19:57:51.000000Z
K 7
svn:log
V 44
resolve merge conflicts

MFC after:	3 weeks

END