From owner-svn-src-all@FreeBSD.ORG  Sun Feb 21 11:22:02 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2A9451065672;
	Sun, 21 Feb 2010 11:22:02 +0000 (UTC)
	(envelope-from antoine@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1943E8FC12;
	Sun, 21 Feb 2010 11:22:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1LBM2A2008110;
	Sun, 21 Feb 2010 11:22:02 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1LBM10u008108;
	Sun, 21 Feb 2010 11:22:01 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201002211122.o1LBM10u008108@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Sun, 21 Feb 2010 11:22:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204168 - stable/8
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Feb 2010 11:22:02 -0000

Author: antoine
Date: Sun Feb 21 11:22:01 2010
New Revision: 204168
URL: http://svn.freebsd.org/changeset/base/204168

Log:
  Merge r200413 and r202755 from head to stable/8:
  reduces white space diff between head and stable/8
  
  Suggested by:	ru@

Modified:
  stable/8/Makefile.inc1   (contents, props changed)

Modified: stable/8/Makefile.inc1
==============================================================================
--- stable/8/Makefile.inc1	Sun Feb 21 11:13:15 2010	(r204167)
+++ stable/8/Makefile.inc1	Sun Feb 21 11:22:01 2010	(r204168)
@@ -1096,8 +1096,8 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
-		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
-		${_lib_libypclnt} lib/libz lib/msun \
+		lib/libradius lib/libsbuf lib/libtacplus \
+		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}