K 10
svn:author
V 5
dougb
K 8
svn:date
V 27
2010-07-01T09:25:06.000000Z
K 7
svn:log
V 65
Remove CONFLICTS for port that won't be added

Feature safe:	yes

END