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


libmysql/Makefile.shared:
  Auto merged
mysys/Makefile.am:
  Auto merged