Merge pull request #26343 from gnidorah/master4
wpsoffice: cleanup and i686 version
authored by Jörg Thalheim and committed by GitHub 8 years ago f80d7868 1ff5f6c4