into  mysql.com:/home/jimw/my/mysql-5.0-clean


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