Merge commit 'origin/master'

Conflicts:
	AUTHORS
	NEWS
	config/include-Makefile.am
	configure.ac
	mount/lomount.c
	po/POTFILES.in
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/es.po
	po/et.po
	po/eu.po
	po/fi.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/nl.po
	po/pl.po
	po/pt_BR.po
	po/ru.po
	po/sl.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/util-linux-ng.pot
	po/vi.po
	po/zh_CN.po

diff --cc hwclock/hwclock.c
Simple merge

diff --cc login-utils/Makefile.am
Simple merge

diff --cc mount/Makefile.am
Simple merge

diff --cc mount/lomount.c
index 2768ea37faf7cffcef2585dda52db00b10f49bff,b17ed5c89430e2b1927d71c35fd99eda6f114b2d..fd12ce2941edbf36bd9269debced5382cdeb33d5
--- 1/mount/lomount.c
--- 2/mount/lomount.c
+++ b/mount/lomount.c
@@@ -975,8 -910,7 +989,8 @@@ usage(void) 
  int
  main(int argc, char **argv) {
        char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
-       int delete, find, c, all;
 +      char *keysize;
+       int delete, find, c, all, capacity;
        int res = 0;
        int showdev = 0;
        int ro = 0;
@@@ -1017,7 -946,7 +1032,7 @@@
        if ((p = strrchr(progname, '/')) != NULL)
                progname = p+1;
  
-       while ((c = getopt_long(argc, argv, "ade:E:fhj:k:No:p:rsv",
 -      while ((c = getopt_long(argc, argv, "acde:E:fhj:o:p:rsv",
++      while ((c = getopt_long(argc, argv, "acde:E:fhj:k:No:p:rsv",
                                longopts, NULL)) != -1) {
                switch (c) {
                case 'a':

diff --cc mount/losetup.8
Simple merge

diff --cc mount/mount.8
Simple merge

diff --cc mount/mount.c
Simple merge