Merge commit 'origin/master'

diff --cc config/include-Makefile.am
Simple merge

diff --cc mount/Makefile.am
Simple merge

diff --cc mount/mount.c
Simple merge

diff --cc sys-utils/Makefile.am
index 22dd88ea137607cba90ae64c463d664f811eda09,8c837e8f24dae1deed4c0ca33aa5f5cdaeb2fd89..862e225720f42f5734111da60f887f20e0ada78c
--- 1/sys-utils/Makefile.am
--- 2/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@@ -80,12 -70,16 +70,16 @@@ if ARCH_HPP
  SETARCH_LINKS += parisc parisc64 parisc32
  endif
  
- SETARCH_MAN_LINKS = $(addsuffix .8, $(SETARCH_LINKS))
- man_MANS += $(SETARCH_MAN_LINKS)
- CLEANFILES=$(SETARCH_MAN_LINKS)
+ RDEV_MAN_LINKS = $(RDEV_LINKS:=.8)
+ SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
+ man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)
+ CLEANFILES = $(man_MANS)
+ 
+ $(RDEV_MAN_LINKS): rdev.8
+       echo ".so rdev.8" > $@
  
  $(SETARCH_MAN_LINKS): setarch.8
 -      echo ".so setarch.8" > $@
 +      echo ".so man8/setarch.8" > $@
  
  install-exec-hook:
        for I in $(RDEV_LINKS); do \