[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 11 Feb 2014 16:50:43 +0000 (17:50 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 11 Feb 2014 16:50:43 +0000 (17:50 +0100)
bzr revid: fva@openerp.com-20140211165043-3t8nys0btenqie59


Trivial merge