Merge r896522 from ^/subversion/trunk to ^/subversion/branches/1.6.x-r896522.

No conflicts here, this branch exists only because a fix needs to be done
that is unique to 1.6.x, see
http://svn.haxx.se/dev/archive-2010-01/0088.shtml.



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