Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-1174667-cga

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