[MERGE] forward port of branch saas-5 up to 651e5ac
authorChristophe Simonis <chs@odoo.com>
Wed, 4 Jun 2014 17:25:40 +0000 (19:25 +0200)
committerChristophe Simonis <chs@odoo.com>
Wed, 4 Jun 2014 17:25:40 +0000 (19:25 +0200)

Trivial merge