[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Tue, 19 Jun 2012 13:42:23 +0000 (15:42 +0200)
committerAntony Lesuisse <al@openerp.com>
Tue, 19 Jun 2012 13:42:23 +0000 (15:42 +0200)
bzr revid: al@openerp.com-20120619132452-ogzgxllhwdoxb1me
bzr revid: al@openerp.com-20120619134223-e08aib295f3wdbcs


Trivial merge