K 10
svn:author
V 7
wollman
K 8
svn:date
V 27
2003-08-24T21:29:40.000000Z
K 7
svn:log
V 103
Delete some merge conflict markers that somehow snuck in here.

Noticed by:	j.e.drews@worldnet.att.net

END