[MERGE] [FORWARD] Forward-port of 7.0 branch until rev 9143.
authorThibault Delavallée <tde@openerp.com>
Tue, 21 May 2013 13:06:27 +0000 (15:06 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 21 May 2013 13:06:27 +0000 (15:06 +0200)
bzr revid: tde@openerp.com-20130521130627-i7zff51rn8xl7dzk


Trivial merge