Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

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


mysql-test/r/flush2.result:
  Auto merged
mysql-test/t/flush2.test:
  Auto merged