[MERGE] removed a few warnings.
authorVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 13:27:59 +0000 (15:27 +0200)
committerVo Minh Thu <vmt@openerp.com>
Mon, 22 Oct 2012 13:27:59 +0000 (15:27 +0200)
commit749ee11eb23933db9018159f256d55cef1ec1202
treece356b69750755cbef0e5ef9a620ee5fe52c379a
parent955ebc8c6715d756d9873715be6ddb59406553c6
parenta1cb39e65cf6eef38053cdcbed83b71c49145bf5
[MERGE] removed a few warnings.

bzr revid: vmt@openerp.com-20121022132759-64qupagcv9cdqnkq
openerp/addons/base/ir/ir_translation.py
openerp/addons/base/security/ir.model.access.csv