into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


sql/net_serv.cc:
  Auto merged