[MERGE] from saas-3
authorRaphael Collet <rco@openerp.com>
Tue, 11 Feb 2014 16:28:43 +0000 (17:28 +0100)
committerRaphael Collet <rco@openerp.com>
Tue, 11 Feb 2014 16:28:43 +0000 (17:28 +0100)
bzr revid: rco@openerp.com-20140211162843-bfowcg6a3qb91h3c


Trivial merge