merge rc2

author LaMont Jones <lamont@mmjgroup.com>

Tue, 17 Jul 2007 14:21:35 +0000 (08:21 -0600)

committer LaMont Jones <lamont@mmjgroup.com>

Tue, 17 Jul 2007 14:21:35 +0000 (08:21 -0600)
author LaMont Jones <lamont@mmjgroup.com>
Tue, 17 Jul 2007 14:21:35 +0000 (08:21 -0600)
committer LaMont Jones <lamont@mmjgroup.com>
Tue, 17 Jul 2007 14:21:35 +0000 (08:21 -0600)
diff --cc configure.ac

index 36b2641f3efc439638fa7dfab15571d67eb4d760,35852f8670c6d40ef9610552322fcd8a6b17b2a5..e884c7bc3b35bd4a2d472956e5a043cc4ace1424
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,4 +1,4 @@@
- AC_INIT(util-linux, 2.13-rc1, kzak@redhat.com)
- -AC_INIT(util-linux-ng, 2.13-rc2, kzak@redhat.com)
++AC_INIT(util-linux, 2.13-rc2, kzak@redhat.com)
   
   AC_PREREQ(2.59)
   
diff --cc misc-utils/whereis.c
Simple merge
diff --cc mount/mount.8
Simple merge
diff --cc sys-utils/Makefile.am
Simple merge
author	LaMont Jones <lamont@mmjgroup.com>
	Tue, 17 Jul 2007 14:21:35 +0000 (08:21 -0600)
committer	LaMont Jones <lamont@mmjgroup.com>
	Tue, 17 Jul 2007 14:21:35 +0000 (08:21 -0600)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
misc-utils/whereis.c	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history
sys-utils/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history