Merge commit 'upstream/2.6.1'
[debian/amanda] / gnulib / socket_.h