[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9491 rev-id: launchpad_transl...
authorDenis Ledoux <dle@openerp.com>
Wed, 2 Oct 2013 10:12:19 +0000 (12:12 +0200)
committerDenis Ledoux <dle@openerp.com>
Wed, 2 Oct 2013 10:12:19 +0000 (12:12 +0200)
bzr revid: dle@openerp.com-20131002101219-h765e9awts5rovye


Trivial merge