K 10 svn:author V 5 wpaul K 8 svn:date V 27 1997-05-28T04:57:39.000000Z K 7 svn:log V 19 Resolve conflicts. END