[MERGE] forward port of branch 7.0 up to revid 5075... ...of branch 7.0 up to revid 5075 chs@openerp.com-20130912141018-qmcyase8zqov9d01 bzr revid: chs@openerp.com-20130906165207-1oklc8cqs0rex3kg bzr revid: chs@openerp.com-20130912150616-v0c383trj7gaa7eu