From: LaMont Jones <lamont@mmjgroup.com>
Date: Wed, 8 Aug 2007 17:47:10 +0000 (-0600)
Subject: Merge commit 'origin'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1950e1b5550f7caa011325ccce32cdd01e673b5;p=util-linux

Merge commit 'origin'

Conflicts:

	configure.ac
---

f1950e1b5550f7caa011325ccce32cdd01e673b5
diff --cc configure.ac
index 1cd1f1ba,f0756ac2..4ccfaac1
--- a/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,4 +1,4 @@@
- AC_INIT(util-linux, 2.13-rc2, kzak@redhat.com)
 -AC_INIT(util-linux-ng, 2.13-rc3, kzak@redhat.com)
++AC_INIT(util-linux, 2.13-rc3, kzak@redhat.com)
  
  AC_PREREQ(2.59)