[MERGE] trunk
authorAntony Lesuisse <al@openerp.com>
Sun, 16 Dec 2012 12:15:09 +0000 (13:15 +0100)
committerAntony Lesuisse <al@openerp.com>
Sun, 16 Dec 2012 12:15:09 +0000 (13:15 +0100)
bzr revid: al@openerp.com-20121216121509-rowl05966ej8su0q


Trivial merge