[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 18 Feb 2014 17:01:53 +0000 (18:01 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 18 Feb 2014 17:01:53 +0000 (18:01 +0100)
bzr revid: fva@openerp.com-20140218170153-1nnck8im4hdkrdr6


Trivial merge