K 10
svn:author
V 3
sam
K 8
svn:date
V 27
2006-03-07T05:44:45.000000Z
K 7
svn:log
V 44
resolve merge conflicts

MFC after:	2 weeks

END