[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Wed, 8 Jun 2011 15:31:39 +0000 (17:31 +0200)
committerAntony Lesuisse <al@openerp.com>
Wed, 8 Jun 2011 15:31:39 +0000 (17:31 +0200)
commit759c3bb6d6a4d8dd48d83debfbafe02ad2daad65
tree2ce89c323a1e835144639c990769b64a38807ee7
parentb5bf0e8c1c9bb0ad104c292d58d31d657e46aeb5
parente1e0860f1d4f7fe6b2f42ec70b27f3076a66656d
[MERGE] trunk

bzr revid: al@openerp.com-20110608153139-zsf80dcs108dqzcy
openerp/addons/base/ir/ir_translation.py
openerp/addons/base/res/res_company.py
openerp/addons/base/res/res_lang.py