[MERGE] Sync with saas-3
authorThibault Delavallée <tde@openerp.com>
Mon, 3 Mar 2014 11:04:00 +0000 (12:04 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 3 Mar 2014 11:04:00 +0000 (12:04 +0100)
bzr revid: tde@openerp.com-20140303110400-arkw9yciv4eopb5a


Trivial merge