[MERGE] from chm
authorFrédéric van der Essen <fva@openerp.com>
Fri, 9 Nov 2012 14:33:54 +0000 (15:33 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 9 Nov 2012 14:33:54 +0000 (15:33 +0100)
bzr revid: fva@openerp.com-20121109143354-gu6n2wauwlegl153


Trivial merge