[MERGE] from saas-3
authorFrédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:51:10 +0000 (16:51 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 10 Feb 2014 15:51:10 +0000 (16:51 +0100)
bzr revid: fva@openerp.com-20140210151007-saw8m1bqwnxek26x
bzr revid: fva@openerp.com-20140210155110-6obc985lc4rl3eyv


Trivial merge