Conflicts: bin/addons/base/res/res_user.py bzr revid: p_christ@hol.gr-20101123152029-c823isjqrpml7dva