[MERGE] Merged with the main trunk branch
authorAnup (OpenERP) <ach@tinyerp.com>
Fri, 14 May 2010 06:34:23 +0000 (12:04 +0530)
committerAnup (OpenERP) <ach@tinyerp.com>
Fri, 14 May 2010 06:34:23 +0000 (12:04 +0530)
commitcb0ff560ac4ef95be07800968823d07815ea5c4d
treeeec058014a3449b43d3c29f1b1b9851779024be9
parentc3c52f663169ff277cb18ab5433dbcb01d10596a
parent2970d09b3aea8a24c950c90332b9a3938134d2da
[MERGE] Merged with the main trunk branch

bzr revid: ach@tinyerp.com-20100514063423-97jbfh395zvzgb3e
bin/addons/base/ir/ir.xml
bin/addons/base/ir/ir_ui_menu.py