Merge remote branch 'origin/master'

Conflicts:
	login-utils/Makefile.am
	mount/lomount.c
	text-utils/od.1

diff --cc fdisk/cfdisk.8
Simple merge

diff --cc getopt/getopt.1
Simple merge

diff --cc hwclock/hwclock.8
Simple merge

diff --cc login-utils/agetty.c
Simple merge

diff --cc mount/Makefile.am
Simple merge

diff --cc mount/lomount.c
index 00107d67a81d336328d927f48dfa58b78914252e,4d99d9f6f374df60c95df0cf84b3c00e98951a34..466a0e5ed9f93d1e6e988c18b30cad4e1a4b76fa
--- 1/mount/lomount.c
--- 2/mount/lomount.c
+++ b/mount/lomount.c
@@@ -18,8 -18,7 +18,9 @@@
  
  #include "loop.h"
  #include "lomount.h"
 +#include "rmd160.h"
 +#include "xstrncpy.h"
+ #include "strutils.h"
  #include "nls.h"
  #include "sundries.h"
  #include "xmalloc.h"

diff --cc mount/lomount.h
index d24d8b62c2be14acdba7eba9aa71ad18c6320ddf,de8b76bf4f13a824b73ce83090766f782bfe0b8a..02403518f08db45f826315295d83dc076a31876f
--- 1/mount/lomount.h
--- 2/mount/lomount.h
+++ b/mount/lomount.h
@@@ -1,5 -1,8 +1,8 @@@
+ #ifndef UTIL_LINUX_LOMOUNT_H
+ #define UTIL_LINUX_LOMOUNT_H
+ 
  extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
 -                  const char *, int, int *);
 +                  const char *, int, int *, int, int);
  extern int del_loop(const char *);
  extern int is_loop_device(const char *);
  extern int is_loop_autoclear(const char *device);

diff --cc mount/losetup.8
Simple merge

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
Simple merge

diff --cc sys-utils/setarch.c
Simple merge