merge from trunk


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/l10n40@1546803 13f79535-47bb-0310-9956-ffa450edef68
tree: 86ac148d859ffe728cafd55e1bd77ae2629d6455
  1. ext_libraries/
  2. ext_sources/
  3. extras/
  4. main/
  5. test/
  6. .gitignore