K 10 svn:author V 3 jkh K 8 svn:date V 27 1995-05-11T02:15:55.000000Z K 7 svn:log V 130 Remove all vestiges of the ALLOW_CONFLICT_FOO evil and replace it with something slightly less evil - a per device conflict flag. END