Merge remote branch 'origin/master'

Conflicts:
	mount/mount.8
	mount/mount.c

diff --cc .gitignore
Simple merge

diff --cc NEWS
Simple merge

diff --cc hwclock/hwclock.c
Simple merge

diff --cc login-utils/agetty.c
index e66b8a5348e94c7c381220f998244cfedd2c801d,57d198039e4bbff1edb3bf7e74b32c6abcd13501..170ed4b3f60392e89e49a6952f7f73e968812b68
--- 1/login-utils/agetty.c
--- 2/login-utils/agetty.c
+++ b/login-utils/agetty.c
@@@ -35,12 -35,9 +35,13 @@@
  #include "strutils.h"
  #include "nls.h"
  #include "pathnames.h"
+ #include "c.h"
  
 -#ifdef __linux__
 +#if defined(__FreeBSD_kernel__)
 +#include <pty.h>
 +#endif
 +
 +#if defined(__linux__) || defined(__FreeBSD_kernel__)
  #include <sys/param.h>
  #define USE_SYSLOG
  #endif

diff --cc mount/Makefile.am
Simple merge

diff --cc mount/lomount.c
Simple merge

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
index 0dea42975e1b41ea394ea8c8b4d98cac513329bf,9fd92480d797d8b85fc927fe4a3f679ddcdf2c2e..36d1a57fec159210368a02ced5c29ed6c625ffd4
--- 1/mount/mount.c
--- 2/mount/mount.c
+++ b/mount/mount.c
@@@ -93,9 -87,15 +93,18 @@@ static int restricted = 1
  /* Contains the fd to read the passphrase from, if any. */
  static int pfd = -1;
  
 +/* Contains the preferred keysize in bits we want to use */
 +static int keysz = 0;
 +
+ #ifdef HAVE_LIBMOUNT_MOUNT
+ static struct libmnt_update *mtab_update;
+ static char *mtab_opts;
+ static unsigned long mtab_flags;
+ 
+ static void prepare_mtab_entry(const char *spec, const char *node,
+                       const char *type, const char *opts, unsigned long flags);
+ #endif
+ 
  /* mount(2) options */
  struct mountargs {
         const char *spec;