into  mysql.com:/home/jimw/my/mysql-5.1-clean


server-tools/instance-manager/options.cc:
  Resolve conflict