[MERGE] Forward-port of 6.1 bugfixes up to rev. 4307
authorOlivier Dony <odo@openerp.com>
Fri, 30 Nov 2012 16:05:23 +0000 (17:05 +0100)
committerOlivier Dony <odo@openerp.com>
Fri, 30 Nov 2012 16:05:23 +0000 (17:05 +0100)
rev.4307 = rev-id launchpad_translations_on_behalf_of_openerp-20121125065030-g5if5pybr61la4yj

bzr revid: odo@openerp.com-20121130160523-nte65mkgp3y330n6


Trivial merge