Merge commit 'upstream/2.6.1'
[debian/amanda] / server-src / amcrypt.sh.in