K 10
svn:author
V 4
will
K 8
svn:date
V 27
2003-02-08T23:43:56.000000Z
K 7
svn:log
V 83
Add suggestions for conflict resolution.

Submitted by:	wes
Reviewed by:	grog, imp

END