tree 47178015084e65c25cc3d2eb6aeb60b379721baf
parent b7e6dc6256eef23093eab7796e609d8200ef3969
author Nick Burch <nick@apache.org> 1418777987 +0000
committer Nick Burch <nick@apache.org> 1418777987 +0000

Merge two release blocking fixes from Trunk

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/REL_3_11_BRANCH@1646123 13f79535-47bb-0310-9956-ffa450edef68