[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Fri, 25 Apr 2014 12:25:10 +0000 (14:25 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 25 Apr 2014 12:25:10 +0000 (14:25 +0200)
bzr revid: fva@openerp.com-20140425122510-y60j039e3khbwwd5


Trivial merge