into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime


server-tools/instance-manager/instance_options.cc:
  manual merge