[MERGE] merge with mma branch
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 24 Apr 2012 06:29:06 +0000 (11:59 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 24 Apr 2012 06:29:06 +0000 (11:59 +0530)
commitb26f2b5790e6677640dfd06229dd25e46896bd64
tree0ebca4555205a898ee77c6deeefacaa4dd5344bf
parent10a01eed1293fb7092a023a4c1dd8b6452a98917
parent6f2b8821e349832ed7203e4e0519e058764c355b
[MERGE] merge with mma branch

bzr revid: psi@tinyerp.com-20120424062906-b8wi1xwj9vkx86gt
openerp/addons/base/ir/ir_model.py