[MERGE] sync with trunk
authorOlivier Dony <odo@openerp.com>
Fri, 15 Jul 2011 00:36:55 +0000 (02:36 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 15 Jul 2011 00:36:55 +0000 (02:36 +0200)
commit6e3e3c3b8bda28b6683a1174b00379b04adcbadd
treedc26c01a0567e3513213bd3a1b7958a0c98136c4
parent3080ba3452b80ce6ebbc236e052808154da05042
parent8504e6158bd943bd210ade35171327d1185303e5
[MERGE] sync with trunk

bzr revid: odo@openerp.com-20110715003655-vx3h5n4109hpa7i2
openerp/addons/base/base_data.xml
openerp/addons/base/ir/ir.xml
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/ir/ir_config_parameter.py
openerp/addons/base/security/ir.model.access.csv
openerp/tools/misc.py