[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:59:55 +0000 (16:59 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 11 Apr 2014 14:59:55 +0000 (16:59 +0200)
bzr revid: tde@openerp.com-20140411145955-91iohb1enc50se5l


Trivial merge