Merge r33641,r33644 from trunk.

Resolved white space conflict.


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