[MERGE]upstream
authorDenis Ledoux <dle@openerp.com>
Fri, 14 Jun 2013 12:28:54 +0000 (14:28 +0200)
committerDenis Ledoux <dle@openerp.com>
Fri, 14 Jun 2013 12:28:54 +0000 (14:28 +0200)
bzr revid: dle@openerp.com-20130614122854-le6s0u679k8kn547


Trivial merge