[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 10:37:13 +0000 (11:37 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 10:37:13 +0000 (11:37 +0100)
bzr revid: fva@openerp.com-20140130103713-k21ji454zhup0row


Trivial merge