[MERGE] from saas-3
authorFrédéric van der Essen <fva@openerp.com>
Thu, 6 Feb 2014 15:15:27 +0000 (16:15 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 6 Feb 2014 15:15:27 +0000 (16:15 +0100)
bzr revid: fva@openerp.com-20140206151527-qxb9sxrz1wi7d0xk


Trivial merge