Index: /mpich2/trunk/src/pm/smpd/wmpiexec/wmpiexec.cs
===================================================================
--- /mpich2/trunk/src/pm/smpd/wmpiexec/wmpiexec.cs (revision 100)
+++ /mpich2/trunk/src/pm/smpd/wmpiexec/wmpiexec.cs (revision 4897)
@@ -382,9 +382,7 @@
 			this.channel_comboBox.Items.AddRange(new object[] {
 																  "sock",
+																  "nemesis",
 																  "shm",
-																  "sshm",
 																  "ssm",
-																  "essm",
-																  "ib",
 																  "mt",
 																  "default",
Index: /mpich2/trunk/src/pm/smpd/wmpiconfig/wmpiconfig.cs
===================================================================
--- /mpich2/trunk/src/pm/smpd/wmpiconfig/wmpiconfig.cs (revision 100)
+++ /mpich2/trunk/src/pm/smpd/wmpiconfig/wmpiconfig.cs (revision 4897)
@@ -76,6 +76,6 @@
 			hash["log"] = new Setting("log", "", "no", "yes,no");
 			hash["logfile"] = new Setting("logfile", "", "none", @"filename (example: c:\temp\smpd.log)");
-			hash["channel"] = new Setting("channel", "", "sock", "sock,mt,ssm,essm,shm,sshm,ib,auto");
-			hash["internode_channel"] = new Setting("internode_channel", "", "ssm", "sock,mt,ssm,essm,ib");
+			hash["channel"] = new Setting("channel", "", "sock", "nemesis,sock,mt,ssm,shm,auto");
+			hash["internode_channel"] = new Setting("internode_channel", "", "ssm", "nemesis,sock,mt,ssm");
 			hash["phrase"] = new Setting("phrase", "", "", "");
 			hash["hosts"] = new Setting("hosts", "", "localhost", "list of hostnames (example: foo bar bazz)");