[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 13:12:29 +0000 (14:12 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 13:12:29 +0000 (14:12 +0100)
bzr revid: fva@openerp.com-20140326131229-euztmx4puq02pz1z


Trivial merge