Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-879295-kjo

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