Merge proposals dependent on lp:~camptocamp/openerp-product-attributes/7.0-rights-attribute_set-1254609

1. 7.0-rights-attribute_set-1254609
2. Dependent merge proposals