K 10
svn:author
V 3
sam
K 8
svn:date
V 27
2005-05-29T18:09:04.000000Z
K 7
svn:log
V 60
resolve merge conflicts

Reviewed by:	bms (earlier version)

END