[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Wed, 1 Aug 2012 14:20:12 +0000 (16:20 +0200)
committerAntony Lesuisse <al@openerp.com>
Wed, 1 Aug 2012 14:20:12 +0000 (16:20 +0200)
bzr revid: al@openerp.com-20120801142012-4520li3knl026jay


Trivial merge