Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50

into  siva.hindu.god:/usr/home/tim/m/bk/50


sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

sql/sql_acl.cc

@@ -5465,8 +5465,6 @@ bool mysql_revoke_all(THD *thd,  List <LEX_USER> &list)
     }  
     if (!find_acl_user(lex_user->host.str, lex_user->user.str, TRUE))
     {
-      sql_print_error("REVOKE ALL PRIVILEGES, GRANT: User '%s'@'%s' does not "
-                      "exists", lex_user->user.str, lex_user->host.str);
       result= -1;
       continue;
     }