K 10
svn:author
V 5
markm
K 8
svn:date
V 27
2003-01-28T22:34:21.000000Z
K 7
svn:log
V 68
Merge conflicts.
This is cunning doublespeak for "use vendor code".

END