K 10
svn:author
V 5
dougb
K 8
svn:date
V 27
2002-07-01T01:20:28.000000Z
K 7
svn:log
V 61
Resolve conflicts, generally in favor of the vendor version.

END