From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jul 22 11:08:00 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87EB11065732;
	Sun, 22 Jul 2012 11:08:00 +0000 (UTC)
	(envelope-from issyl0@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E1ADA8FC0C;
	Sun, 22 Jul 2012 11:07:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6MB7x0Y076307;
	Sun, 22 Jul 2012 11:07:59 GMT (envelope-from issyl0@svn.freebsd.org)
Received: (from issyl0@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6MB7xR9076306;
	Sun, 22 Jul 2012 11:07:59 GMT (envelope-from issyl0@svn.freebsd.org)
Message-Id: <201207221107.q6MB7xR9076306@svn.freebsd.org>
From: Isabell Long <issyl0@FreeBSD.org>
Date: Sun, 22 Jul 2012 11:07:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238684 - in stable/9: sbin/ipfw sys
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jul 2012 11:08:00 -0000

Author: issyl0 (doc committer)
Date: Sun Jul 22 11:07:59 2012
New Revision: 238684
URL: http://svn.freebsd.org/changeset/base/238684

Log:
  Fix mergeinfo that should have been committed as part of r238683.
  
  Approved by:	gavin
  Approved by:	re (kib), implicit, approved in original merge request

Modified:
Directory Properties:
  stable/9/sbin/ipfw/   (props changed)
  stable/9/sys/   (props changed)