[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 3 Feb 2014 10:51:47 +0000 (11:51 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 3 Feb 2014 10:51:47 +0000 (11:51 +0100)
bzr revid: fva@openerp.com-20140203105147-1rwz4ja8q5y4gqe8


Trivial merge