Add httpd trunk r1589699, on behalf of any suckers using Visual Studio 6 build