K 10 svn:author V 6 philip K 8 svn:date V 27 2009-09-02T12:12:14.000000Z K 7 svn:log V 55 Fix CONFLICTS. PR: ports/138479 Submitted by: amdmi3 END