Synch with 2.0 branch.

Justin beat me to the vote, but I had the time for the backport. :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102468 13f79535-47bb-0310-9956-ffa450edef68