into  dl145h.mysql.com:/users/gbichot/mysql-5.1-rpl


sql/slave.cc:
  Auto merged
mysql-test/t/disabled.def:
  merge