[MERGE]: Merge with lp:~openerp-dev/openobject-server/ksa-dev-framework for osv_memor...
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 3 Sep 2010 05:39:27 +0000 (11:09 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 3 Sep 2010 05:39:27 +0000 (11:09 +0530)
bzr revid: rpa@tinyerp.com-20100903053927-xvr7ourv9rgmvt4t


Trivial merge