[MERGE] merge
[odoo/odoo.git] / pixmaps / openerp-icon.png
2008-09-10 Stephane Wirtelrename the files with tinyerp in the name