[MERGE] merged latest trunk
authorOlivier Dony <odo@openerp.com>
Tue, 31 May 2011 10:37:20 +0000 (12:37 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 31 May 2011 10:37:20 +0000 (12:37 +0200)
commit89e66c498dc30c5985f9ccef5a1873776f202be1
tree0f4dc1b6a723e0953617280621f3863a68af6d03
parenta1fe08562dca54ed9d4151f33e7aa2f877c17c1d
parent8dc31b78ab78b836130aa038aabf4d3f0531b977
[MERGE] merged latest trunk

bzr revid: odo@openerp.com-20110531103720-mas6phcnb22qj4p2
openerp/addons/base/ir/ir_model.py
openerp/tools/convert.py