Merge branch 'master' into debian

Merge branch 'master' into debian

* master: (30 commits)
  Prepare for 3.6
  Switch to xz (and away from bzip2)
  Fix build
  Add check for size_autodetect
  Move size_autodetect to library
  Add check for getmaskbyte(), too
  Don't forget to distribute this new "macro.h", too
  Add a check for append_serve, too
  Separate out a useful macro
  Update comment to reflect today's realities
  Move "append_serve" to library, too.
  Whitespace fix
  Fix Makefile.am's so that "make distcheck" works again
  Add .gitignore with compiled files in this directory.
  Make it compile (and pass)
  Add test for dup_serve
  Move dup_serve() to library
  Enable maintainer-mode by default
  Do a htonl conversion of opt.
  Add a "code" test suite
  ...

Conflicts:
	Makefile.am