Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-reexport-thu

lp:~openerp-dev/openobject-server/trunk-reexport-thu has no merge proposals.