into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/item_strfunc.cc:
  Auto merged