[MERGE] from saas-3
authorFrédéric van der Essen <fva@openerp.com>
Fri, 7 Feb 2014 15:50:55 +0000 (16:50 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 7 Feb 2014 15:50:55 +0000 (16:50 +0100)
bzr revid: fva@openerp.com-20140207155055-3z8o3fvx2zkoqe91


Trivial merge