merge was broken git-svn-id: https://svn.apache.org/repos/asf/httpd/apreq/trunk@1042893 13f79535-47bb-0310-9956-ffa450edef68