Merge proposals dependent on lp:~openerp-dev/openobject-server/trunk-bug-1096833-fka

lp:~openerp-dev/openobject-server/trunk-bug-1096833-fka has no merge proposals.