into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqldump.c:
  Auto merged
sql/sql_show.cc:
  Auto merged
configure.in:
  Manual merge, the filesed of Makfile.in has been removed but needed to
  add it back in to convert .la libs to .a libs