into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
include/my_pthread.h:
  Manual merge