[MERGE] Merge trunk
[odoo/odoo.git] / debian / compat
1 7