[MERGE] merged latest trunk
authorOlivier Dony <odo@openerp.com>
Fri, 8 Apr 2011 20:35:40 +0000 (22:35 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 8 Apr 2011 20:35:40 +0000 (22:35 +0200)
commit2ad705317c577f0badd5add3e141b828f8f20605
treeff67f76db4ba726847e9236139d17d999f895147
parent8ab9bac2b16659602932413be69141bba3e03ac2
parent9cfda85bfa39518afb4324084054db82f4cbc347
[MERGE] merged latest trunk

bzr revid: odo@openerp.com-20110408203540-amjsn89g4drl8ojk
openerp/addons/base/ir/ir_model.py