Index: /trunk/Ohana/src/opihi/lib.shell/multicommand.c
===================================================================
--- /trunk/Ohana/src/opihi/lib.shell/multicommand.c	(revision 19788)
+++ /trunk/Ohana/src/opihi/lib.shell/multicommand.c	(revision 19789)
@@ -3,4 +3,6 @@
 static int server = 0;
 static int bufferPending = FALSE;
+
+#define MSG_TIMEOUT 30.0
 
 int getServer () {
@@ -93,5 +95,5 @@
 
 	  // receive the command exit status
-	  if (ExpectMessage (server, 10.0, &message)) {
+	  if (ExpectMessage (server, MSG_TIMEOUT, &message)) {
 	    switch (errno) {
 	      case EPIPE:
@@ -108,5 +110,5 @@
 
 	  // receive the resulting stderr
-	  if (ExpectMessage (server, 10.0, &message)) {
+	  if (ExpectMessage (server, MSG_TIMEOUT, &message)) {
 	    switch (errno) {
 	      case EPIPE:
@@ -123,5 +125,5 @@
 
 	  // receive the resulting stdout
-	  if (ExpectMessage (server, 10.0, &message)) {
+	  if (ExpectMessage (server, MSG_TIMEOUT, &message)) {
 	    switch (errno) {
 	      case EPIPE: