[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 17:28:22 +0000 (18:28 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 24 Feb 2014 17:28:22 +0000 (18:28 +0100)
bzr revid: fva@openerp.com-20140224172822-ehn3xeb7rb1xro07


Trivial merge