into  mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race


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