[MERGE] from upstream
[odoo/odoo.git] / install / openerp-icon.png
install/openerp-icon.png