merged with upstream

diff --cc Makefile.in
Simple merge

diff --cc autogen.sh
index 6895de2,4fb6bf7..4fb6bf7
mode 100644,100644..100755
--- 1/autogen.sh
--- 2/autogen.sh
+++ b/autogen.sh

diff --cc configure.ac
Simple merge

diff --cc fs/cpio.c
Simple merge

diff --cc gendistlist.sh
index 7f6c32a,36685a0..36685a0
mode 100644,100644..100755
--- 1/gendistlist.sh
--- 2/gendistlist.sh
+++ b/gendistlist.sh