[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 21 Nov 2012 16:58:51 +0000 (17:58 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 21 Nov 2012 16:58:51 +0000 (17:58 +0100)
bzr revid: fva@openerp.com-20121121165851-fl8qq97ufx1ya5lu


Trivial merge