Merge branch 'master' of git://nbd.git.sourceforge.net/gitroot/nbd/nbd

diff --combined Makefile.am
index f6b8b8d,8c51576..15807c3
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -1,9 -1,9 +1,9 @@@
  SUBDIRS = man
- bin_PROGRAMS = nbd-server
+ bin_PROGRAMS = nbd-server nbd-trdump
  sbin_PROGRAMS = @NBD_CLIENT_NAME@
- EXTRA_PROGRAMS = nbd-client knbd-client nbd-trdump
+ EXTRA_PROGRAMS = nbd-client knbd-client
  TESTS_ENVIRONMENT=$(srcdir)/simple_test
 -TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity
 +TESTS = cmd cfg1 cfgmulti cfgnew cfgsize write flush integrity integrityhuge
  check_PROGRAMS = nbd-tester-client
  knbd_client_SOURCES = nbd-client.c cliserv.h
  nbd_client_SOURCES = nbd-client.c cliserv.h
@@@ -15,7 -15,7 +15,7 @@@ nbd_tester_client_CFLAGS = @CFLAGS@ @GL
  nbd_trdump_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
  nbd_server_LDADD = @GLIB_LIBS@
  nbd_tester_client_LDADD = @GLIB_LIBS@
 -EXTRA_DIST = gznbd simple_test integrity-test.tr maketr
 +EXTRA_DIST = gznbd simple_test integrity-test.tr integrityhuge-test.tr maketr
  dist-hook:
        rm -Rf `find $(distdir) -name '.svn' -type d -print`
  cmd:
@@@ -26,5 -26,4 +26,5 @@@ cfgsize
  write:
  flush:
  integrity:
 +integrityhuge: