[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 16:18:02 +0000 (17:18 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 29 Jan 2014 16:18:02 +0000 (17:18 +0100)
bzr revid: fva@openerp.com-20140129161802-14patbv206pqj68j


Trivial merge