Merge r1352031 under obvious fix rule (zlib 1.2.5 is not available for download)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x@1462351 13f79535-47bb-0310-9956-ffa450edef68