Merge proposals dependent on lp:~acl-openerp/openobject-server/6.1-opw-576860-acl

lp:~acl-openerp/openobject-server/6.1-opw-576860-acl has no merge proposals.