K 10
svn:author
V 6
obrien
K 8
svn:date
V 27
2003-08-25T09:28:54.000000Z
K 7
svn:log
V 118
Remove merge conflict that I didn't notice as it was in the middle of a
comment and thus compiled.

Submitted by:	bde

END