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


sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged