merge trunk
authorniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 12:06:18 +0000 (14:06 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Fri, 18 Oct 2013 12:06:18 +0000 (14:06 +0200)
bzr revid: nicolas.vanhoren@openerp.com-20131018120618-0o7hsq6pb7b4zw37


Trivial merge