merged with trunk r615269

git-svn-id: https://svn.apache.org/repos/asf/poi/tags/REL_3_0_2_BETA3@615279 13f79535-47bb-0310-9956-ffa450edef68
6 files changed