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


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