Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-1185039-pooja

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