[MERGE] merge from trunk-dev-framework
authorFramework Team <>
Tue, 30 Mar 2010 11:30:26 +0000 (13:30 +0200)
committerOlivier Dony <odo@openerp.com>
Tue, 30 Mar 2010 11:30:26 +0000 (13:30 +0200)
commitb0e4c9b169a5cc1a700a9f02297b60b2649ca0cb
tree6556f5c3c91d36f23b2931868d0d56e757ed9f36
parent415d714484c5d54d1cc8079746452135bb06741b
parentd69ca9424e26ef0b783f5357de564f252ace2b84
[MERGE] merge from trunk-dev-framework

bzr revid: odo@openerp.com-20100330113026-u49ic0qxq1sa51bn
bin/osv/orm.py
bin/report/interface.py