K 10
svn:author
V 7
mandree
K 8
svn:date
V 27
2012-11-15T23:30:32.009586Z
K 7
svn:log
V 83
Update CONFLICTS.

Suggested by:	ketas's ports conflicts checker
Feature safe:	yes

END