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


client/mysqldump.c:
  Auto merged
extra/comp_err.c:
  Auto merged
mysys/my_init.c:
  Auto merged