[MERGE] from trunk
authorXavier Morel <xmo@openerp.com>
Tue, 26 Jul 2011 11:12:11 +0000 (13:12 +0200)
committerXavier Morel <xmo@openerp.com>
Tue, 26 Jul 2011 11:12:11 +0000 (13:12 +0200)
commitce4d05a29ce931a216f29b8281370956f9e4d6ad
treee7faa63aaf521276a0a541d1cfa597108be73562
parentc80c5f5fc3d43351e1e67ac7607493bd3f108f40
parentb3b00733af3db724ab6e083f7b059227f23435fe
[MERGE] from trunk

bzr revid: xmo@openerp.com-20110726111211-7hcd378z1k068nys
openerp/addons/base/__openerp__.py
openerp/addons/base/i18n/es_CL.po