into mysql.com:/home/hf/work/mysql-5.0.mrg


mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/wait_timeout.test:
  Auto merged