[MERGE] [FORWARD] Forward port of addons 7.0 until revision 9172
authorThibault Delavallée <tde@openerp.com>
Tue, 28 May 2013 11:45:49 +0000 (13:45 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 28 May 2013 11:45:49 +0000 (13:45 +0200)
bzr revid: tde@openerp.com-20130528114549-69cx4kssei3mlcvq


Trivial merge