K 10 svn:author V 5 lioux K 8 svn:date V 27 2004-07-20T23:57:51.000000Z K 7 svn:log V 225 Re-add CONFLICTS=faad* so that mpeg4ip does not conflict with audio/faad port when it installs its own libmp4v2 (WITHOUT_MPEG4IP) library instead of the mpeg4ip's one PR: 66724 Submitted by: michael johnson END