[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Tue, 25 Feb 2014 10:59:24 +0000 (11:59 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 25 Feb 2014 10:59:24 +0000 (11:59 +0100)
bzr revid: fva@openerp.com-20140225105924-1r2c9ha7703zlfxz


Trivial merge