into  kindahl-laptop.dnsalias.net:/home/bk/b28722-mysql-5.1-rpl


mysql-test/r/binlog_multi_engine.result:
  Manual merge
mysql-test/t/binlog_multi_engine.test:
  Manual merge