Index: trunk/Ohana/src/opihi/cmd.basic/echo.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.basic/echo.c	(revision 7917)
+++ trunk/Ohana/src/opihi/cmd.basic/echo.c	(revision 14190)
@@ -5,8 +5,10 @@
   int i;
 
-  for (i = 1; i < argc; i++) {
+  for (i = 1; i < argc - 1; i++) {
     gprint (GP_LOG, "%s ", argv[i]);
   }
-  gprint (GP_LOG, "\n");
+  if (argc >= 2) {
+      gprint (GP_LOG, "%s\n", argv[argc - 1]);
+  }
   return (TRUE);
 }