backport r1928729#14

jfclere wants to merge 2 commits intoapache:1.7.xapache/apr-util:1.7.xfrom

jfclere:1.7.xjfclere/apr-util:1.7.xCopy head branch name to clipboard