Merging from http_integration r1-r71 .
Authored by: mikhail_beris 2008-08-26
Parent: [r71]
Child: [r73]