[MERGE] OPW 576744: res_users: backport of 6.1 fix to avoid blocking logins when...
authorOlivier Dony <odo@openerp.com>
Wed, 22 Aug 2012 16:24:06 +0000 (18:24 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 22 Aug 2012 16:24:06 +0000 (18:24 +0200)
Original 6.1 fix was r4049, odo@openerp.com-20120213183207-45ptopqm0szritgx

lp bug: https://launchpad.net/bugs/713216 fixed

bzr revid: odo@openerp.com-20120822162406-ou4ibu0mds2zqhkk


Trivial merge