[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sat, 24 Sep 2011 16:08:02 +0000 (18:08 +0200)
committerAntony Lesuisse <al@openerp.com>
Sat, 24 Sep 2011 16:08:02 +0000 (18:08 +0200)
bzr revid: al@openerp.com-20110924160802-ebb7rawu71rykluu


Trivial merge