[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 13:21:34 +0000 (14:21 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 13:21:34 +0000 (14:21 +0100)
bzr revid: fva@openerp.com-20140129132134-vw0hwk1573ippjyz


Trivial merge