[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Wed, 14 May 2014 10:51:42 +0000 (12:51 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 14 May 2014 10:51:42 +0000 (12:51 +0200)

Trivial merge