into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
scripts/mysql_system_tables.sql:
  Auto merged
sql/mysqld.cc:
  Auto merged