Merge proposals dependent on lp:~openerp-dev/openobject-addons/7.0-payroll-recursive-fix-csn

1. 7.0-payroll-recursive-fix-csn
2. Dependent merge proposals