[MERGE] remove warnings
authorChristophe Simonis <chs@openerp.com>
Wed, 20 Nov 2013 15:12:37 +0000 (16:12 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 20 Nov 2013 15:12:37 +0000 (16:12 +0100)
bzr revid: chs@openerp.com-20131120151237-ij9llw0fnhya10f7


Trivial merge