[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:12 +0000 (09:45 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 26 Apr 2013 07:45:12 +0000 (09:45 +0200)
bzr revid: tde@openerp.com-20130425143852-vslppf235z2dyhjc
bzr revid: tde@openerp.com-20130426074512-10d3bsx7f0cki2aj


Trivial merge