[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 5 Jan 2012 13:39:47 +0000 (14:39 +0100)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Thu, 5 Jan 2012 13:39:47 +0000 (14:39 +0100)
bzr revid: nicolas.vanhoren@openerp.com-20120105133947-hjde1btpo630n9kr


Trivial merge