K 10
svn:author
V 3
hrs
K 8
svn:date
V 27
2011-06-20T18:57:14.000000Z
K 7
svn:log
V 42
Update CONFLICTS lines.

PR:	ports/158028

END