PERFORCE change 148482 for review

[John Birrell]

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

Change 148482 by jb at 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