[merge] trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 16 Apr 2012 08:39:20 +0000 (10:39 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 16 Apr 2012 08:39:20 +0000 (10:39 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120416083920-vqvgh2wmfh1pcxyu


Trivial merge