K 10 svn:author V 6 brooks K 8 svn:date V 27 2009-11-04T18:02:43.000000Z K 7 svn:log V 78 Upgrade to r86028. Reduce the complexity of CONFLICTS. Chase plist changes. END