[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Tue, 8 Apr 2014 08:34:18 +0000 (10:34 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 8 Apr 2014 08:34:18 +0000 (10:34 +0200)
bzr revid: tde@openerp.com-20140408083418-0gn78r4ueg7tyu0v


Trivial merge