[MERGE] forward port of branch saas-5 up to revid c19bb8c
authorChristophe Simonis <chs@odoo.com>
Sun, 1 Jun 2014 12:35:54 +0000 (14:35 +0200)
committerChristophe Simonis <chs@odoo.com>
Sun, 1 Jun 2014 12:35:54 +0000 (14:35 +0200)

Trivial merge