[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 10:33:07 +0000 (11:33 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 10:33:07 +0000 (11:33 +0100)
bzr revid: fva@openerp.com-20140326103307-lchlskkdweospgps


Trivial merge