K 10 svn:author V 2 zi K 8 svn:date V 27 2011-09-07T02:22:30.000000Z K 7 svn:log V 80 Add CONFLICT for newly repocopied net-mgmt/collectd5 Approved by: wxs (mentor) END