[MERGE]merged with trunk
[odoo/odoo.git] / addons / anonymous / __init__.py