K 10 svn:author V 8 truckman K 8 svn:date V 27 2017-10-26T18:38:56.174064Z K 7 svn:log V 307 Add a security patch taken from Apache OpenOffice 4.1.4. Add a LICENSE entry for MPL10. Code containing both MPL10 and MPL11 licenses is bundled. Add CONFLICTS_INSTALL. Move --with-ant-home and -with-jdk-home to Makefile from Makefile.knobs. MFH: 2017Q4 Security: 27229c67-b8ff-11e7-9f79-ac9e174be3af END