[MERGE] Sync with 7.0.
authorThibault Delavallée <tde@openerp.com>
Mon, 7 Jan 2013 09:26:45 +0000 (10:26 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 7 Jan 2013 09:26:45 +0000 (10:26 +0100)
bzr revid: tde@openerp.com-20130107092645-dkqhjb5vv54yubuf


Trivial merge