[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 13:50:38 +0000 (14:50 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 13:50:38 +0000 (14:50 +0100)
bzr revid: fva@openerp.com-20140224135038-3l6p5ebb5klmw8yr


Trivial merge