Merge shellback.(none):/home/msvensson/mysql/work/my51-work
unknown authored
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


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