[MERGE] forward port branch saas-6 up to eb4f0309

addons/auth_ldap/users_ldap.py

@@ -84,7 +84,7 @@ class CompanyLDAP(osv.osv):
             _logger.warning('Could not format LDAP filter. Your filter should contain one \'%s\'.')
             return False
         try:
-            results = self.query(conf, filter)
+            results = self.query(conf, filter.encode('utf-8'))
 
             # Get rid of (None, attrs) for searchResultReference replies
             results = [i for i in results if i[0]]