merge against post-b_brw HEAD

diff --git a/lustre/obdecho/Makefile.am b/lustre/obdecho/Makefile.am
index b0ddafe..ad0e0ff 100644 (file)
--- a/lustre/obdecho/Makefile.am
+++ b/lustre/obdecho/Makefile.am
@@ -9,7 +9,7 @@ modulefs_DATA = obdecho.o
 EXTRA_PROGRAMS = obdecho
 
 LINX=
-obdecho_SOURCES = echo.c lproc_echo.c $(LINX)
+obdecho_SOURCES = echo.c echo_client.c lproc_echo.c $(LINX)
 
 include $(top_srcdir)/Rules