[merge]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 9 May 2012 15:46:07 +0000 (17:46 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 9 May 2012 15:46:07 +0000 (17:46 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120509154607-tsylr5b8zydj6lyu


Trivial merge