Merge the only thing on trunk that isn't already in httpd24threading into httpd24threading ahead of merging everything back to trunk. This is purely for the sake of my sanity...

git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/httpd24threading@1602081 13f79535-47bb-0310-9956-ffa450edef68