Merge commit 'origin'

diff --cc mount/mount.c
Simple merge

diff --cc sys-utils/Makefile.am
index d5e48deaf4ab5c82b461f138e2e4f47656a5ea0d,898b9e65661ca90239fe303d93ee15be10fe44e9..3e2f7b6b733504ae875673584a86a459fec21e89
--- 1/sys-utils/Makefile.am
--- 2/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@@ -75,5 -75,8 +75,9 @@@ install-exec-hook
        done
        for I in $(SETARCH_LINKS); do \
                cd $(DESTDIR)$(usrbinexecdir) && ln -sf setarch $$I ; \
 +              cd $(DESTDIR)$(man8dir) && ln -sf ../man8/setarch.8 $${I}.8; \
        done
+       for I in $(SETARCH_LINKS); do \
+                 echo ".so setarch.8" > $(DESTDIR)$(man8dir)/$$I.8 ; \
+         done
+