K 10 svn:author V 5 peter K 8 svn:date V 27 1999-05-08T18:12:03.000000Z K 7 svn:log V 79 Update for new resource_set_*() interface. Also deal with the conflicts flag. END