[MERGE] [FWD] Forward porting in trunk of the 7.0 server branch until rev 4787 (revid...
authorThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 14:50:01 +0000 (15:50 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 14:50:01 +0000 (15:50 +0100)
bzr revid: tde@openerp.com-20130115145001-f5w4y9axv3ddu4ww


Trivial merge