From owner-p4-projects@FreeBSD.ORG  Tue Aug 26 00:35:52 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1C32D1065678; Tue, 26 Aug 2008 00:35:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D47D9106566C
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 00:35:51 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B56F68FC13
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 00:35:51 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7Q0ZpDL031858
	for <perforce@freebsd.org>; Tue, 26 Aug 2008 00:35:51 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7Q0ZpxZ031856
	for perforce@freebsd.org; Tue, 26 Aug 2008 00:35:51 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 26 Aug 2008 00:35:51 GMT
Message-Id: <200808260035.m7Q0ZpxZ031856@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148482 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Aug 2008 00:35:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=148482

Change 148482 by jb@freebsd3 on 2008/08/26 00:35:29

	IF6

Affected files ...

.. //depot/projects/dtrace6/src/etc/mtree/BSD.local.dist#2 integrate
.. //depot/projects/dtrace6/src/etc/mtree/BSD.usr.dist#2 integrate
.. //depot/projects/dtrace6/src/sys/conf/newvers.sh#5 integrate

Differences ...

==== //depot/projects/dtrace6/src/etc/mtree/BSD.local.dist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.117.2.1 2006/01/17 06:53:17 dougb Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.117.2.3 2008/08/25 13:33:45 des Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #

==== //depot/projects/dtrace6/src/etc/mtree/BSD.usr.dist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.312.2.1 2005/11/16 07:47:43 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.312.2.2 2008/08/25 13:25:56 des Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -545,6 +545,12 @@
             ..
             lt_LT.UTF-8
             ..
+            nb_NO.ISO8859-1
+            ..
+            nb_NO.ISO8859-15
+            ..
+            nb_NO.UTF-8
+            ..
             nl_BE.ISO8859-1
             ..
             nl_BE.ISO8859-15
@@ -557,6 +563,12 @@
             ..
             nl_NL.UTF-8
             ..
+            nn_NO.ISO8859-1
+            ..
+            nn_NO.ISO8859-15
+            ..
+            nn_NO.UTF-8
+            ..
             no_NO.ISO8859-1
             ..
             no_NO.ISO8859-15

==== //depot/projects/dtrace6/src/sys/conf/newvers.sh#5 (text+ko) ====

@@ -28,11 +28,11 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.69.2.17 2008/07/16 10:29:42 dougb Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.69.2.18 2008/08/25 18:47:28 kensmith Exp $
 
 TYPE="FreeBSD"
-REVISION="6.3"
-BRANCH="STABLE"
+REVISION="6.4"
+BRANCH="PRERELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi