merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 17 Sep 2012 15:34:20 +0000 (17:34 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Mon, 17 Sep 2012 15:34:20 +0000 (17:34 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20120917153420-vnnulpokzz2l6kvb


Trivial merge