tree c03ea0b27cae58f1fc2c4dda7bee10e46db5652d
parent 6a6d7a81cc44ee932f30c1ca188213557dc3b979
author Stefan Sperling <stsp@apache.org> 1337614788 +0000
committer Stefan Sperling <stsp@apache.org> 1337614788 +0000

On the 1.7.x-r1341012 branch, merge r1341076 from trunk (clean merge).


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