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


server-tools/instance-manager/instance.cc:
  Auto merged