merge the differences in apache-1.3 from tag apache-apr-merge-3 up

to mpm-merge-1 onto the mpm tree

prior to the merge, the mpm tree was tagged with apache-1_3-merge-1-pre
and after the merge, the mpm tree will be tagged with apache-1_3-merge-1-post

note: none of htdocs/manual is present in mpm at this point.


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