[MERGE] merged fix of bug 721595
[odoo/odoo.git] / python25-compat /
2009-09-10 P. ChristeasBackport the HTTP server code from python 2.6 to 2.5