[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:09:29 +0000 (16:09 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:09:29 +0000 (16:09 +0200)
bzr revid: tde@openerp.com-20140411140929-7w4qo086j991houy


Trivial merge