into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/rpl_row_mysqlbinlog.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
BitKeeper/deleted/.del-.del-rpl_critical_errors.result:
  Delete: BitKeeper/deleted/.del-rpl_critical_errors.result