Merge branch 'trunk' of https://github.com/apache/openoffice into trunk
Early, incomplete attempt to port connectivity to gbuild.Patch by: me