From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 12 01:19:39 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B1E7106566B;
	Mon, 12 Jan 2009 01:19:39 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F38CD8FC19;
	Mon, 12 Jan 2009 01:19:38 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0C1JcpK044073;
	Mon, 12 Jan 2009 01:19:38 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0C1Jc3N044072;
	Mon, 12 Jan 2009 01:19:38 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901120119.n0C1Jc3N044072@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 12 Jan 2009 01:19:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187070 - projects/vap7/usr.sbin
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2009 01:19:39 -0000

Author: sam
Date: Mon Jan 12 01:19:38 2009
New Revision: 187070
URL: http://svn.freebsd.org/changeset/base/187070

Log:
  fix merge botch

Modified:
  projects/vap7/usr.sbin/Makefile

Modified: projects/vap7/usr.sbin/Makefile
==============================================================================
--- projects/vap7/usr.sbin/Makefile	Mon Jan 12 00:39:22 2009	(r187069)
+++ projects/vap7/usr.sbin/Makefile	Mon Jan 12 01:19:38 2009	(r187070)
@@ -157,7 +157,7 @@ SUBDIR=	${_ac} \
 	${_rtsold} \
 	${_rwhod} \
 	${_sa} \
-	sade \
+	${_sade} \
 	${_sendmail} \
 	setfib \
 	setfmac \