[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 23 Aug 2012 07:31:39 +0000 (09:31 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 23 Aug 2012 07:31:39 +0000 (09:31 +0200)
bzr revid: fva@openerp.com-20120823073139-qupxt49dvs407so5


Trivial merge