[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 13:31:21 +0000 (14:31 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 13:31:21 +0000 (14:31 +0100)
bzr revid: fva@openerp.com-20140130133121-4n75ma3xp5wn77du


Trivial merge