into  kindahl-laptop.dnsalias.net:/home/bk/b29968-merge-5.1-rpl


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