[MERGE] forward port of branch saas-3 up to b5b7dcc
authorDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 12:23:58 +0000 (14:23 +0200)
committerDenis Ledoux <dle@odoo.com>
Mon, 15 Sep 2014 12:23:58 +0000 (14:23 +0200)

Trivial merge