[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Thu, 25 Jul 2013 08:36:06 +0000 (10:36 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 25 Jul 2013 08:36:06 +0000 (10:36 +0200)
bzr revid: tde@openerp.com-20130725083606-4nnhytqmt8o5takm


Trivial merge