anchor.diff:      CrashArgs = lists:concat([" -env ERL_CRASH_DUMP \"",CrashFile,"\" "]),
       FailOnError = start_node_get_option_value(fail_on_error, OptList, true),
       Prog0 = start_node_get_option_value(erl, OptList, default),
  -    Prog = quote_progname(pick_erl_program(Prog0)),
  +    {ClearAFlags, Prog1} = pick_erl_program(Prog0),
  +    Prog = quote_progname(Prog1),
       Args = 
   	case string:find(SuppliedArgs,"-setcookie") of
   	    nomatch ->
  
positive.code:     Args = lists:concat([" ", SuppliedArgs, CrashArgs]),
  
      Prog0 = start_node_get_option_value(erl, OptList, default),
      Prog = pick_erl_program(Prog0),
      Ret = 
  	case start_which_node(OptList) of
  	    {error,Reason} -> {{error,Reason},undefined,undefined};
  	    Host0 -> do_start_node_slave(Host0,SlaveName,Args,Prog,Cleanup)
  	end,
      gen_server:reply(From,Ret).
  
  
  do_start_node_slave(Host0, SlaveName, Args, Prog, Cleanup) ->
      Host =
  	case Host0 of
  	    local -> test_server_sup:hoststr();
  	    _ -> cast_to_list(Host0)
  	end,
      Cmd = Prog ++ " " ++ Args,
      case slave:start(Host, SlaveName, Args, no_link, Prog) of
  	{ok,Nodename} ->
  	    case Cleanup of
  		true -> ets:insert(slave_tab,#slave_info{name=Nodename});
  		false -> ok
  	    end,
  	    {{ok,Nodename}, Host, Cmd, [], []};
  	Ret ->
  	    {Ret, Host, Cmd}
      end.
  
  
  wait_for_node_started(LSock,Timeout,Client,Cleanup,TI,CtrlPid) ->
      case gen_tcp:accept(LSock,Timeout) of
  
negative.code: 			NodeStarted,
  			CrashArgs,
  			" ", Args]),
      Opts = case {ClearAFlags, start_node_get_option_value(env, OptList, [])} of
  	       {false, []} -> [];
  	       {false, Env} -> [{env, Env}];
                 {true, []} -> [{env, [{"ERL_AFLAGS", false}]}];
  	       {true, Env} -> [{env, [{"ERL_AFLAGS", false} | Env]}]
  	   end,
      %% peer is always started on localhost
      %%
  