[MERGE] opw 51169
authorJean-Christophe VASSORT <jcv@openerp.com>
Tue, 21 Feb 2012 16:39:18 +0000 (17:39 +0100)
committerJean-Christophe VASSORT <jcv@openerp.com>
Tue, 21 Feb 2012 16:39:18 +0000 (17:39 +0100)
bzr revid: jcv@openerp.com-20120221163918-lk8xfaa00djaz3el


Trivial merge