From owner-cvs-etc  Tue Jun 10 00:57:30 1997
Return-Path: <owner-cvs-etc>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id AAA17510
          for cvs-etc-outgoing; Tue, 10 Jun 1997 00:57:30 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id AAA17473;
          Tue, 10 Jun 1997 00:57:18 -0700 (PDT)
From: Satoshi Asami <asami@FreeBSD.ORG>
Received: (from asami@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id AAA16699;
	Tue, 10 Jun 1997 00:57:02 -0700 (PDT)
Date: Tue, 10 Jun 1997 00:57:02 -0700 (PDT)
Message-Id: <199706100757.AAA16699@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-etc@FreeBSD.ORG
Subject: cvs commit: src/etc/mtree BSD.local.dist BSD.x11.dist
Sender: owner-cvs-etc@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

asami       1997/06/10 00:57:02 PDT

  Modified files:        (Branch: RELENG_2_1_0)
    etc/mtree            BSD.local.dist BSD.x11.dist 
  Log:
  Merge BSD.x11.dist rev 1.2 and BSD.local.dist rev 1.28 from -current.
  
  Revision  Changes    Path
  1.11.4.7  +3 -3      src/etc/mtree/BSD.local.dist
  1.1.4.2   +24 -6     src/etc/mtree/BSD.x11.dist