[MERGE] merged dev-trunk-framework branch, including docstring improvements and a...
authorOlivier Dony <odo@openerp.com>
Thu, 8 Apr 2010 10:55:37 +0000 (12:55 +0200)
committerOlivier Dony <odo@openerp.com>
Thu, 8 Apr 2010 10:55:37 +0000 (12:55 +0200)
bzr revid: odo@openerp.com-20100408105537-uy02ichkpw25bu3e

1  2 
bin/osv/orm.py

diff --cc bin/osv/orm.py
Simple merge