ci before merge
authorAntoine Huvelle <ahu@openerp.com>
Wed, 30 Nov 2011 10:28:11 +0000 (11:28 +0100)
committerAntoine Huvelle <ahu@openerp.com>
Wed, 30 Nov 2011 10:28:11 +0000 (11:28 +0100)
bzr revid: ahu@openerp.com-20111130102811-87venjx5ez3d46hp


Trivial merge