Hopefully this is it... not sure what's going on with my

OS X box: svn merge is acting wonky


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@696451 13f79535-47bb-0310-9956-ffa450edef68