[FWD] [MERGE] Forward port of addons-v7 until rev. 8736.
authorThibault Delavallée <tde@openerp.com>
Thu, 21 Feb 2013 12:04:02 +0000 (13:04 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 21 Feb 2013 12:04:02 +0000 (13:04 +0100)
bzr revid: tde@openerp.com-20130221120402-qgywhwpq7qvr9p0p


Trivial merge