[MERGE] Sync with 7.0, to have last fixes that were tested inside this branch.
authorThibault Delavallée <tde@openerp.com>
Thu, 3 Jan 2013 15:22:27 +0000 (16:22 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 3 Jan 2013 15:22:27 +0000 (16:22 +0100)
bzr revid: tde@openerp.com-20130103120144-530ndclf0bbcwb50
bzr revid: tde@openerp.com-20130103152227-twdztf4awjit3vwc


Trivial merge