Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-950629-amp

lp:~openerp-dev/openobject-addons/trunk-bug-950629-amp has no merge proposals.