[MERGE] Forward-port of 7.0 bugfixes up to rev. 9339 (dle@openerp.com-20130801151539...
authorDenis Ledoux <dle@openerp.com>
Thu, 1 Aug 2013 15:53:34 +0000 (17:53 +0200)
committerDenis Ledoux <dle@openerp.com>
Thu, 1 Aug 2013 15:53:34 +0000 (17:53 +0200)
bzr revid: dle@openerp.com-20130801142357-09zojxyhaop9fwna
bzr revid: dle@openerp.com-20130801155334-hq3dzmheppde3xqp


Trivial merge