Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt


mysql-test/mysql-test-run.pl:
  Auto merged