Merge branches/gbuild-reintegration to trunk.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1755455 13f79535-47bb-0310-9956-ffa450edef68