[MERGE] trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 22 May 2012 16:01:10 +0000 (18:01 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 22 May 2012 16:01:10 +0000 (18:01 +0200)
bzr revid: fva@openerp.com-20120522160110-l39lmwrtih9srnkg


Trivial merge