[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 4007 revid:dle@openerp...
authorDenis Ledoux <dle@openerp.com>
Thu, 1 May 2014 12:19:15 +0000 (14:19 +0200)
committerDenis Ledoux <dle@openerp.com>
Thu, 1 May 2014 12:19:15 +0000 (14:19 +0200)
bzr revid: dle@openerp.com-20140430123818-zzdxmat4c5yg9gg7
bzr revid: dle@openerp.com-20140501121915-q88k37nd25ietw8c


Trivial merge