[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 3 Oct 2011 15:35:09 +0000 (17:35 +0200)
committerVo Minh Thu <vmt@openerp.com>
Mon, 3 Oct 2011 15:35:09 +0000 (17:35 +0200)
commitd9b6f5e2d0d0c30e4e55bc72454b6ec4b720232c
tree14eb229c961e3413abd06b6ad1a86d64d2d3a2ab
parentfbb6e5e56aaf36ff652edbec0181a0fcb95a3601
parentbf3d0d604c89edfd709603c8ca261d020e9ac748
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20111003153509-8mbfg1t8hm92pult
openerp/addons/base/ir/ir.xml
openerp/addons/base/security/base_security.xml
openerp/addons/base/security/ir.model.access.csv