[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 09:53:20 +0000 (11:53 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 28 Apr 2014 09:53:20 +0000 (11:53 +0200)
bzr revid: fva@openerp.com-20140428095320-cm0phsplaoanv566


Trivial merge