Merge commit 'upstream/2.6.1'
[debian/amanda] / config / gnulib.m4i