[MERGE]:openobject-server/trunk-configuration-rework
authorksa (Open ERP) <ksa@tinyerp.co.in>
Tue, 19 Apr 2011 06:30:25 +0000 (12:00 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Tue, 19 Apr 2011 06:30:25 +0000 (12:00 +0530)
commit01f64ad6edcb304f409a3f1317bed11a781cf39b
treef922c9404c472fda675a55f2e3e5f23c08410a7b
parent4ab3faacb5c2411e7f66b503289c648c60e1febc
parent91b91a13ffe72fba2d1446dc050fc1639b376210
[MERGE]:openobject-server/trunk-configuration-rework

bzr revid: ksa@tinyerp.co.in-20110419063025-zui24ha67jilse8c
openerp/addons/base/base_update.xml
openerp/addons/base/ir/ir.xml
openerp/addons/base/res/res_company.py
openerp/osv/orm.py