[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Thu, 27 Jun 2013 09:59:20 +0000 (11:59 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 27 Jun 2013 09:59:20 +0000 (11:59 +0200)
bzr revid: fva@openerp.com-20130627095920-vzuny1vmnrebajrr


Trivial merge