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

diff --cc Makefile.am
index f6b8b8d37e34e079d29035f63dbc52ae3b3b459b,8c51576160d7c6303e4e4990fb701b4466d1bb9e..15807c3cb451551485b298b97f76bd4aa482f9d7
--- 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