[MERGE] Merge Upstream
authorStephane Wirtel <stw@openerp.com>
Fri, 30 Sep 2011 10:23:26 +0000 (12:23 +0200)
committerStephane Wirtel <stw@openerp.com>
Fri, 30 Sep 2011 10:23:26 +0000 (12:23 +0200)
bzr revid: stw@openerp.com-20110930102326-ic6hhmwu15i0r8l1

1  2 
openerp/modules/db.py

Simple merge