Merge commit 'upstream/2.6.1'
[debian/amanda] / gnulib / regenerate / no-error.patch.BACKUP.7723.patch