[MERGE] forward port of branch 7.0 up to revid 4168 launchpad_translations_on_behalf_of_openerp-20140329073044-67cql7rohzkmuub9
[MERGE] forward port of branch 7.0 up to revid 4168 launchpad_translations_on_behalf_of_openerp-20140329073044-67cql7rohzkmuub9

havt/openerp-web,havt/openerp-web,havt/openerp-web,havt/openerp-web,havt/openerp-web