Merge branch 'maint'

Conflicts:

	configure

diff --cc configure
index 89e1611,13c55e1..6df3943
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -16165,7 -16248,7 +16219,7 @@@ LIBOBJS!$LIBOBJS$ac_deli
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --cc configure.in
Simple merge

diff --cc doc/libext2fs.texinfo
Simple merge

diff --cc lib/blkid/probe.c
Simple merge