Merge proposals dependent on lp:~openerp-dev/openerp-web/trunk-apiculture

lp:~openerp-dev/openerp-web/trunk-apiculture has no merge proposals.