[MERGE] merged from lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind
[MERGE] merged from lp:~openerp-dev/openobject-server/trunk-bugfixes-Ind

akretion/openerp-server,akretion/openerp-server,akretion/openerp-server