into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/include/master-slave.inc:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Merge 5.0->5.1
mysql-test/t/binlog_killed.test:
  Merge 5.0->5.1