[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sat, 1 Oct 2011 01:22:10 +0000 (03:22 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 1 Oct 2011 01:22:10 +0000 (03:22 +0200)
bzr revid: al@openerp.com-20111001012210-uqqso9y80a21hgeo

1  2 
openerp/osv/osv.py
openerp/wsgi.py

Simple merge
diff --cc openerp/wsgi.py
Simple merge