From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 22 Apr 2008 01:35:44 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.41-WIP-0427~6
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=4476105bf377eb9bd30d2771b21b2ada06c13e82;p=tools%2Fe2fsprogs.git

Merge branch 'maint'

Conflicts:

	configure
---

4476105bf377eb9bd30d2771b21b2ada06c13e82
diff --cc configure
index 89e1611,13c55e1..6df3943
--- a/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