2007-09-28  Martin Sebor  <sebor@roguewave.com>

	* branches/4.2.0: Merged the head of trunk.


git-svn-id: https://svn.apache.org/repos/asf/incubator/stdcxx/branches/4.2.0@580483 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/GNUmakefile b/GNUmakefile
index 9f6b44f..a081fa4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,7 +4,27 @@
 #
 # main makefile to build and test the C++ Standard library
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 #
 # Usage:
 #
@@ -42,7 +62,7 @@
 #
 #   The variable SHELL can be defined to override the default shell, /bin/sh.
 #
-##############################################################################
+########################################################################
 #
 # Targets:
 #
@@ -131,7 +151,7 @@
 #
 #   WARNFLAGS - any compiler warning options
 #
-##############################################################################
+########################################################################
 
 SHELL = /bin/sh
 
@@ -231,9 +251,9 @@
 
 ifeq ($(in_topdir),1)
 
-  ############################################################################
+  ######################################################################
   # THIS BLOCK IS EVALUATED ONLY WHEN MAKE IS INVOKED IN TOPDIR
-  ############################################################################
+  ######################################################################
 
   # try to determine configuration (unless specified on the command line)
   # invoke $(SHELL) from within the $(shell) function to silence shell
@@ -536,7 +556,9 @@
   # #defined in the rw/_config.h library header
   LIBVER := $(shell awk '/^.define _RWSTD_VER / { major = substr ($$3, 3, 2); minor = substr ($$3, 5, 2); micro = substr ($$3, 7, 2); print (major + 0) "." (minor + 0) "." (micro + 0) }' $(TOPDIR)/include/rw/_config.h)
 
-### TARGETS ##################################################################
+########################################################################
+#  TARGETS
+########################################################################
 
 all: libstd
 
@@ -639,9 +661,9 @@
 
 else   # ifneq ($(in_topdir),1) ##############################################
 
-  ############################################################################
+  ######################################################################
   # THIS BLOCK IS EVALUATED ONLY WHEN MAKE IS INVOKED IN BUILDDIR
-  ############################################################################
+  ######################################################################
 
 all: config lib examples util rwtest tests $(PHDTSTDIR)
 
diff --git a/NOTICE.txt b/NOTICE.txt
index cbea76d..9591575 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,12 +1,12 @@
-Apache stdcxx
+Apache C++ Standard Library - stdcxx
 
-Copyright 2005-2006 The Apache Software Foundation.
+Copyright 2005-2007 The Apache Software Foundation.
 
 This product includes software developed at The Apache Software Foundation
 (http://www.apache.org/).
 
-Portions of this software were developed at Rogue Wave Software, Copyright
-(c) 1994-2005.
+Portions of this software were developed at Rogue Wave Software, Inc.,
+Copyright (c) 1994-2007.
 
 This software contains code derived from the HP Standard Template Library,
 Copyright (c) 1994 Hewlett-Packard Company.
diff --git a/README b/README
index c6a1f36..20c222a 100644
--- a/README
+++ b/README
@@ -1,9 +1,8 @@
 
             $Id$
 
-               STDCXX - Apache C++ Standard Library 4.1.3
-          (based on Rogue Wave(R) C++ Standard Library 4.1.3)
-          ---------------------------------------------------
+       STDCXX - Apache C++ Standard Library 4.2.0 (pre-release)
+       --------------------------------------------------------
 
   i. Disclaimer
   -------------
@@ -21,6 +20,7 @@
   0  Index
   --------
 
+  Disclaimer ....................................................... i
   Index ............................................................ 0
   Contents ......................................................... 1
   Requirements ..................................................... 2
@@ -495,25 +495,30 @@
 
   o  > CD stdlib-X.Y.Z-YYYYMMDD\stdlib
      > DIR /D  # this is ${TOPDIR}
-     GNUmakefile  etc  examples  generate.bat include  src  tests
+     GNUmakefile  etc  examples  configure.bat  include  src  tests
 
      If your distribution  does not contain the test  suite and/or the
      examples, the output will look like so:
 
      > DIR /D  # this is ${TOPDIR}
-     GNUmakefile  etc  generate.bat include  src
+     GNUmakefile  etc  configure.bat  include  src
 
-  o  > .\generate.bat /BUILDDIR:<builddir> /CONFIG:<config>
+  o  > .\configure.bat  [/BUILDDIR:<builddir>] [/CONFIG:<config>]
 
      <builddir> is the pathname of the build directory where to create
                 the solution  and  projects;  the  directory  will  be
                 created  (as will  all  its  required  subdirectories)
-                this is a required argument
+
+                The  <builddir>  argument  is optional.  When  not
+                specified a current directory is assumed.
+
      <config>   name  (not  pathname)  of  a  config  file  containing
                 compiler options; the available configuration files
                 are:
                 icc-9.0.config  - for Intel C++ 9.0
                 icc-9.1.config  - for Intel C++ 9.1
+                icc-10.0.config - for Intel C++ 10.0
+                icc-10.0-x64.config - for Intel C++ 10.0 (x64 platform)
                 msvc-7.0.config - for Microsoft Visual C++ .NET
                 msvc-7.1.config - for Microsoft Visual C++ .NET 2003
                 msvc-8.0.config - for Microsoft Visual C++ .NET 2005
@@ -521,10 +526,13 @@
                                       2005 (x64 platform)
                 msvcex-8.0.config - for Microsoft Visual C++ Express
                                     2005
-                this is a required argument
+
+                The  <config>  argument  is optional.  When  not
+                specified, the suitable config file will be selected
+                automatically.
 
   o  Example:
-       > generate.bat /BUILDDIR:C:\stdcxx /CONFIG:msvc-7.1
+       > configure.bat  /BUILDDIR:C:\stdcxx /CONFIG:msvc-7.1
 
      This command will create a build directory rooted at ${BUILDDIR},
      the solution file  ${BUILDDIR}\msvc-7.1\msvc-7.1.sln, the project
diff --git a/bin/xbuildgen b/bin/xbuildgen
new file mode 100755
index 0000000..407347f
--- /dev/null
+++ b/bin/xbuildgen
@@ -0,0 +1,966 @@
+#!/bin/sh
+#
+# $Id$
+#
+########################################################################
+#
+#  Licensed to the Apache Software  Foundation (ASF) under one or more
+#  contributor  license agreements.  See  the NOTICE  file distributed
+#  with  this  work  for  additional information  regarding  copyright
+#  ownership.   The ASF  licenses this  file to  you under  the Apache
+#  License, Version  2.0 (the  "License"); you may  not use  this file
+#  except in  compliance with the License.   You may obtain  a copy of
+#  the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the  License is distributed on an  "AS IS" BASIS,
+#  WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+#  implied.   See  the License  for  the  specific language  governing
+#  permissions and limitations under the License.
+#
+#  Copyright 2007 Rogue Wave Software.
+#
+########################################################################
+#
+# NAME
+#     xbuildgen - Generate build results across multiple platforms.
+#
+# SYNOPSIS
+#     xbuildgen [option(s)...] [log-file(s)...]
+#
+# DESCRIPTION
+#     The xbuildgen utility generates a build result in HTML format
+#     across multiple platforms or tests with builds in columns and
+#     components such as examples, locales, and tests in rows by
+#     default.
+#
+# OPTIONS
+#     -n   No clean. Avoid removing temporary files.
+#
+#     -s   Stylesheet. Create a style sheet named resultstyle.css in
+#          the same directory as the output file when the -o option
+#          is specified, or in the current working directory otherwise.
+#
+#     -v   Verbose. Produce verbose output on stdout.
+#
+#     -e <list-of-examples>
+#          Generate a report for the specified list of example programs
+#          with examples listed in columns and builds in rows.
+#
+#     -l <list-of-locales>
+#          Generate a report for the specified list of locales with
+#          locales listed in columns and builds in rows.
+#
+#     -o <output-file>
+#          Specify the pathname of the output file. The utility will
+#          use stdout when no output file is specified.
+#
+#     -t <list-of-tests>
+#          Generate a report for the specified list of tests with
+#          tests listed in columns and builds in rows.
+#
+########################################################################
+
+
+# by default, display one component (example, locale, or test) per row
+components_in_rows=1
+
+## process command line options
+while getopts ":nsv:e:l:o:t:" opt_name; do
+    case $opt_name in
+        # options with no arguments 
+
+        n)  # avoid cleaning up temporary files
+            no_clean=1
+            ;;
+
+        s)  # create a style sheet
+            create_stylesheet=1
+            ;;
+
+        v)  # output all components (including passing ones)
+            verbose=1
+            ;;
+
+        # options with arguments 
+
+        e)  # argument is a list of examples to process
+            example_list=$OPTARG
+            components_in_rows=0
+            ;;
+
+        l)  # argument is a list of locales to process
+            locale_list=$OPTARG
+            components_in_rows=0
+            ;;
+
+        o)  # argument is the name of output file (stdout by default)
+            outfile=$OPTARG
+            ;;
+
+        t)  # argument is a list of tests to process
+            test_list=$OPTARG
+            components_in_rows=0
+            ;;
+
+        *) echo "unknown option : -$opt_name" >&2;
+           exit 1;;
+     esac;
+done
+
+# remove command line options and their arguments from the command line
+shift $(($OPTIND - 1))
+
+# take the remaining command line arguments as the names of logs
+# to process
+gzlogs=$*
+
+
+# set the TMP variable to /tmp if not set
+[ -z $TMP ] && TMP=/tmp
+
+######################################################################
+
+# output to output file when specified or to stdout
+output ()
+{
+    if [ $# -eq 0 ]; then
+        # no arguments provided, copy its own stdin to outfile
+        if [ -z $outfile ]; then
+            cat
+        else
+            cat >>$outfile
+        fi
+    elif [ -z $outfile ]; then
+        echo "$*"
+    else
+        echo "$*" >>$outfile
+    fi
+}
+
+
+######################################################################
+
+# remove output file if specified
+if [ ! -z $outfile ]; then
+    rm -f $outfile
+fi
+
+
+# overwrite style sheet
+if [ "$create_stylesheet" = "1" ]; then
+
+    if [ -z $outfile ]; then
+        dir=.
+    else
+        dir=`dirname $outfile`
+    fi
+
+    cat <<EOF >$dir/resultstyle.css
+
+table {
+    border-width:0px;
+    background:#000000;
+    font-size:smaller;
+}
+th {
+    font-family:fixed
+    font-size:smaller;
+    background:#cccccc;
+    text-align:center;
+}
+td {
+    font-family:fixed;
+    font-size:smaller;
+    padding: 3px;
+    text-align: center;
+    background-color: lightblue;
+}
+td.rowno {
+    font-family:fixed;
+    font-size:smaller;
+    padding: 3px;
+    text-align: right;
+    background-color:#cccccc;
+}
+td.name {
+    font-family:fixed;
+    font-size:smaller;
+    padding: 3px;
+    text-align: left;
+    background-color:lightblue;
+}
+td.number {
+    font-family:fixed;
+    font-size:smaller;
+    padding: 3px;
+    text-align: center;
+    background-color:lightblue;
+}
+td.na {
+    background:white;
+    text-align:left;
+    font-family:fixed
+    font-size:smaller;
+}
+td.header {
+    background:#cccccc;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+    font-weight:bold;
+}
+td.OK {
+    background:forestgreen;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+    font-weight:bold;
+}
+td.BASE {
+    background:lightgreen;
+    text-align:center;
+    font-size:smaller;
+    font-weight:bold;
+    font-family:fixed;
+}
+td.NOUT {
+    background:lightgreen;
+    text-align:center;
+    font-size:smaller;
+    font-weight:bold;
+    font-family:fixed;
+}
+td.OUTPUT {
+    background:lightgreen;
+    text-align:center;
+    font-size:smaller;
+    font-weight:bold;
+    font-family:fixed;
+}
+td.missing {
+    color:white;
+    background:lightgray;
+    text-align:center;
+    font-size:smaller;
+    font-family:fixed;
+    font-weight:bold;
+}
+td.WARN {
+    color:red;
+    background:#ffff99;
+    text-align:center;
+    font-family:fixed
+}
+td.EXIT {
+    color:red;
+    background:gold;
+    text-align:center;
+    font-weight:bold;
+    font-family:fixed;
+    font-size:smaller;
+}
+td.FORMAT {
+    background:#ffffcc;
+    text-align:center;
+    font-family:fixed
+    font-size:smaller;
+}
+td.RUNWARN {
+    color:black;
+    background:#ffff99;
+    text-align:center;
+    font-weight:bold;
+    font-family:fixed;
+    font-size:smaller;
+}
+td.DIFF {
+    color:red;
+    background:#ffff99;
+    font-weight:bold;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+}
+td.ASSERT {
+    color:red;
+    background:#ffff99;
+    font-weight:bold;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+}
+td.SIGNAL {
+    color:yellow;
+    background:red;
+    font-weight:bold;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+}
+td.COMP {
+    background:violet;
+    font-weight:bold;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+}
+td.LINK {
+    color:yellow;
+    background:mediumpurple;
+    font-weight:bold;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+}
+td.xdep {
+    color:yellow;
+    background:gray;
+    font-weight:bold;
+    text-align:center;
+    font-family:fixed;
+    font-size:smaller;
+}
+EOF
+
+fi
+
+######################################################################
+
+# output the initial portion of the HTML file
+cat <<EOF | output
+<html>
+  <head>
+    <link rel="stylesheet" href="resultstyle.css" type="text/css"
+          title="Cross-Build View Style Sheet">
+  </head>
+  <body>
+
+    <h1>Multi-platform Test Result View</h1>
+    Generated `date`
+    <hr>
+
+    <h2>Index</h2>
+
+    <ul>
+        <li><a href="#examples">Examples</a></li>
+        <li><a href="#tests">Tests</a></li>
+        <li><a href="#locales">Locales</a></li>
+        <li><a href="#codes">Codes and Colors</a></li>
+        <li><a href="#buildtypes">Build Types</a></li>
+    </ul>
+    <hr>
+EOF
+
+######################################################################
+
+# the location of the logs
+logdir="http://people.apache.org/~sebor/stdcxx/results"
+
+# the names of temporary files containing the list of components
+# (examples, locales, and tests) to process and include in the
+# generated report
+tests_file=$TMP/.stdcxx-tests.$$
+examples_file=$TMP/.stdcxx-examples.$$
+locales_file=$TMP/.stdcxx-locales.$$
+
+# remove temporary files in case they exist
+rm -f $tests_file $examples_file $locales_file
+
+if [ $? -ne 0 ]; then
+    exit 2
+fi
+
+
+cat <<EOF | output
+    <h2>Logs and Columns</h2>
+    <ol>
+EOF
+
+######################################################################
+# expand gzipped logs and extract the relevant portion from each into
+# a smaller text file for fast and easy processing
+
+n=0
+for l in $gzlogs; do
+    n=`expr $n + 1`
+    fname=`basename $l`
+
+    if [ $components_in_rows -ne 0 ]; then
+        # output one component per row with their results in columns
+        table_header="$table_header <th><div title=\"$fname\">$n</div></th>"
+
+        output "      <li><a href=\"$logdir/$fname\">$fname</a></li>"
+    fi
+
+    # runlog=$TMP/.stdcxx-tmplog.$$.$n
+    runlog=$TMP/`basename $l`.$$
+    textlogs="$textlogs $runlog"
+
+      gunzip -c $l                             \
+    | sed -e "1,/### [g]*make runall/d"        \
+          -e "/^[g]*make\[.\]: .*/d"           \
+          -e "/###/,999999d"                   \
+          -e "/^PHDIR/d"                       \
+          -e "/\/bin\/sh: /d" > $runlog
+
+    status=$?
+
+    if [ $status -eq 0 ]; then
+
+        # extract the list of locales from the log
+
+          sed -e "1,2d" $runlog                    \
+        | sed -n -e "1,/NAME  */p"                 \
+        | sed -e "/NAME  */d"                      \
+              -e "s/  *.*//" >>$locales_file
+
+        status=$?
+    else
+        exit 3
+    fi
+
+    if [ $status -eq 0 ]; then
+
+        # extract the list of tests from the log
+
+          sed "1,2d" $runlog                       \
+        | sed -e "1,/NAME  */d"                    \
+              -e "/NAME  */,999999d"               \
+              -e "s/  *.*//" >>$tests_file;
+
+        status=$?
+    else
+        exit 3
+    fi
+
+    if [ $status -eq 0 ]; then
+
+        # extract the list of examples from the log
+                                               \
+          sed "1,2d" $runlog                       \
+        | sed -e "1,/NAME  */d"                    \
+        | sed -e "1,/NAME  */d"                    \
+        | sed -e "/NAME  */,999999d"               \
+              -e "s/  *.*//" >>$examples_file
+    else
+        exit 3
+    fi
+done
+
+
+n=0
+if [ $components_in_rows -eq 0 ]; then
+
+    for c in $example_list $test_list $locale_list; do
+        n=`expr $n + 1`
+
+        # output one build per row, with components in columns
+        table_header="$table_header <th><div title=\"$c\">$n</div></th>"
+        output "      <li>$c</li>"
+    done
+fi
+
+output "    </ol>"
+output "    <hr>"
+
+if [ -s $locales_file ]; then
+    # if the list of locales non-empty sort it and weed out duplicates
+       sort $locales_file | uniq > $locales_file.2 \
+    && mv $locales_file.2 $locales_file
+fi
+
+if [ -s $examples_file ]; then
+    # if the list of examples is non-empty sort it and weed out duplicates
+       sort $examples_file | uniq > $examples_file.2 \
+    && mv $examples_file.2 $examples_file
+fi
+
+if [ -s $tests_file ]; then
+    # if list of tests file is non-empty sort it and weed out duplicates
+       sort $tests_file | uniq > $tests_file.2 \
+    && mv $tests_file.2 $tests_file
+fi
+
+######################################################################
+
+awkscript=$TMP/stdcxx-cross.$$.awk
+
+cat > $awkscript <<EOF
+BEGIN {
+    columns     = ""
+    compinx     = 0
+    count       = 0
+    max_asserts = 0
+    min_asserts = -1
+}
+\$0 ~ "^" name "  *[^-]" {
+
+    status = \$2
+
+    if (status == 0) {
+        if (comp == "example" || \$5 == 0) {
+            if (\$3 == 0) {
+                class = "OK"
+                value = "0"
+            }
+            else {
+                ++count;
+                ++nfailures [compinx]
+                class = "RUNWARN"
+                value = "(" \$3 ")"
+            }
+        }
+        else {
+            ++count
+            ++nfailures [compinx]
+
+            class   = "ASSERT"
+            # value = \$5 " / " \$4
+            value   = "(" \$5 ")"
+        }
+
+        if (comp == "test") {
+            asserts [n] = \$5
+
+            if (max_asserts < \$4) {
+                max_asserts = \$4
+            }
+
+            if (\$4 < min_asserts || min_asserts < 0) {
+                min_asserts = \$4
+            }
+        }
+    }
+    else if (0 < status && status < 256) {
+        ++count
+        ++nfailures [compinx]
+
+        class = "EXIT"
+        value = status
+    }
+    else if (status == "FORMAT" || status == "NOUT" || status == "OUTPUT") {
+        ++count
+
+        class = status
+        value = status
+    }
+    else if (status == "DIFF" || status == "COMP" || status == "LINK") {
+        ++count
+        ++nfailures [compinx]
+
+        class = status
+        value = status
+    }
+    else {
+        ++count
+        ++nfailures [compinx]
+
+        class = "SIGNAL"
+        value = status
+    }
+
+    columns = columns "\n        <td class=\"" class "\">" value "</td>"
+
+    ++compinx
+}
+
+function build_summary () {
+    if (verbose || count) {
+        print "      <tr>"
+        print "        <td class=\"rowno\">" n "</td>"
+        print "        <td class=\"name\"><a name=\"" name "\">" \
+                       name "</a></td>"
+
+        if (comp == "test") {
+            print "        <td class=\"number\">" max_asserts "</td>"
+        }
+
+        print columns;
+        print "      </tr>"
+    }
+
+    tmpfile = "$TMP/.stdcxx-failtotals.$$.txt"
+
+    if (count) {
+        getline < tmpfile
+        close(tmpfile)
+
+        ORS=" "
+        for (i = 0; i < compinx; ++i) {
+            print nfailures [i] + \$(i + 1) > tmpfile
+        }
+
+        ORS="\n"
+        print "" >> tmpfile
+        close(tmpfile)
+    }
+
+    if (FILENAME == "-") {
+
+        if (comp == "test") {
+            print "<td class=\"header\"></td>"
+        }
+
+        getline < tmpfile
+
+        for (i = 1; i < NF + 1; ++i) {
+            print "        <td class=\"header\">" \$(i) "</td>"
+        }
+
+        system("rm -f " tmpfile)
+    }
+}
+
+function component_summary () {
+    print columns;
+}
+
+END {
+    if (comp != "") {
+        build_summary()
+    }
+    else {
+        component_summary()
+    }
+}
+EOF
+
+######################################################################
+
+# process a list of components, one component per row
+process_components()
+{
+    component_name=$1
+    component_list=$2
+
+    if [ $component_name = "test" ]; then
+        column3="        <th><div title=\"maximum total assertions\">asserts</div></th>"
+    else
+        unset column3
+    fi
+
+    cat <<EOF | output
+    <h2>Results of ${component_name}s</h2>
+    <table>
+      <tr>
+        <th><div title="${component_name} number">###</div></th>
+        <th>
+          <a name="${component_name}s"></a>$component_name name
+        </th>
+        $column3
+        $table_header
+      </tr>
+EOF
+
+    n=0;
+    for c in $component_list; do
+
+        n=`expr $n + 1`
+
+          awk -f $awkscript \
+              n=$n name=$c verbose=$verbose comp=$component_name \
+              $textlogs \
+        | output
+
+    done
+    cat <<EOF | output
+      <tr>
+        <td class="rowno">$n</th>
+        <td class="header">
+          <div title="total number of ${component_name}s/failed number of ${component_name}s">total/failed</div>
+        </td>
+EOF
+
+    echo "" | awk -f $awkscript comp=$component_name | output
+
+    cat <<EOF | output
+      </tr>
+    </table>
+EOF
+}
+
+######################################################################
+
+# process a list of builds, one build per row
+process_builds()
+{
+    component_name=$1
+    component_list=$2
+
+    cat <<EOF | output
+    <h2>Results of ${component_name}s</h2>
+    <table>
+      <tr>
+        <th><a name="${component_name}s"></a>log</th>
+        $table_header
+      </tr>
+EOF
+
+    for l in $textlogs; do
+
+        fname=`basename $l .$$`
+        cat <<EOF | output
+      <tr>
+        <td class="name">
+            <a href="$logdir/$fname">$fname</a>
+        </td>
+EOF
+
+        for c in $component_list; do
+
+            line=`grep "^$c  *[^-]" $l`
+            if [ $? -eq 0 -a "$line" != "" ]; then
+                  echo $line \
+                | awk -f $awkscript component=$component_name \
+                      name=$c verbose=$verbose \
+                | output
+            else
+                output "        <td class=\"missing\">N/A</td>"
+            fi
+        done
+
+        output "      </tr>"
+    done
+    output "    </table>"
+}
+
+
+if [ $components_in_rows -ne 0 ]; then
+    process_components "example" "`cat $examples_file`"
+    process_components "test" "`cat $tests_file`"
+    process_components "locale" "`cat $locales_file`"
+else
+    if [ "$examples_list" != "" ]; then
+        process_builds "example" "$examples_list"
+    fi
+
+    if [ "$test_list" != "" ]; then
+        process_builds "test" "$test_list"
+    fi
+
+    if [ "$locale_list" != "" ]; then
+        process_builds "locale" "$locale_list"
+    fi
+fi
+
+
+######################################################################
+# output the rest of the HTML file
+cat <<EOF | output
+    <h2><a name="codes"></a>Codes and Colors</h2>
+    <table>
+      <thead>
+        <tr>
+          <td class="header">Symbol</td>
+          <td class="header">Meaning</td>
+        </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td class="OK">OK</td>
+            <td class="na">
+              Component completed successfully and produced the expected
+              output.
+            </td>
+          </tr>
+          <tr>
+            <td class="NOUT">NOUT</td>
+            <td class="na">
+              Component completed successfully and produced no output.
+            </td>
+          </tr>
+          <tr>
+            <td class="BASE">BASE</td>
+            <td class="na">
+              Component completed successfully and matched the baseline.
+            </td>
+          </tr>
+          <tr>
+            <td class="missing">N/A</td>
+            <td class="na">Component was not tested.</td>
+          </tr>
+          <tr>
+            <td class="XDEP">XDEP</td>
+            <td class="na">
+                Component was not attempted due to a missing (or failed)
+                dependency.
+            </td>
+          </tr>
+          <tr>
+            <td class="COMP">COMP</td>
+            <td class="na">Component failed to compile.</td>
+          </tr>
+          <tr>
+            <td class="LINK">LINK</td>
+            <td class="na">
+                 Component compiled successfully but failed to link.
+            </td>
+          </tr>
+          <tr>
+            <td class="WARN">WARN</td>
+            <td class="na">
+               Component compiled and linked successfully but with warnings.
+            </td>
+          </tr>
+          <tr>
+            <td class="runwarn">(N)</td>
+            <td class="na">
+              Component compiled and linked successfully, exited with
+              a status of 0, but produced N warnings at runtime.
+            </td>
+          </tr>
+          <tr>
+            <td class="EXIT">N</td>
+            <td class="na">
+              Component compiled and linked successfully but exited with
+              a non-zero status of N.
+            </td>
+          </tr>
+          <tr>
+            <td class="DIFF">DIFF</td>
+            <td class="na">
+              Component compiled and linked successfully, exited with
+              a status of 0, but produced unexpected output.
+            </td>
+          </tr>
+          <tr>
+            <td class="SIGNAL">[SIG]&lt;name&gt;</td>
+            <td class="na">
+              Component compiled and linked successfully, but exited
+              with the named signal (for example, SIGABRT).
+            </td>
+          </tr>
+          <tr>
+            <td class="assert">(N)</td>
+            <td class="na">
+              Component compiled and linked successfully, exited with
+              a status of 0, but failed Nassertions at runtime.
+            </td>
+          </tr>
+      </tbody>
+    </table>
+    
+    <h2><a name="buildtypes"></a>Build Types</h2>
+
+    <table>
+      <thead>
+        <tr>
+          <td class="header">Library:</td>
+          <th colspan="2">Archive Library</th>
+          <th colspan="2">Shared Library</th>
+          <th colspan="2">Shared Archive (AIX)</th>
+          </tr>
+          <tr>
+            <td class="header">Number/Symbol</td>
+            <td class="header">s<br>(32-bit)</td>
+            <td class="header">S<br>(64-bit)</td>
+            <td class="header">d<br>(32-bit)</td>
+            <td class="header">D<br>(64-bit)</td> 
+            <td class="header">a<br>(32-bit)</td>
+            <td class="header">A<br>(64-bit)</td>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td class="header"><b>8</b><br>(optimized)</td>
+            <td class="na">
+              <b>8s</b>: Debugging off, optimized, not reentrant.
+            </td>
+            <td class="na">
+              <b>8S</b>: Debugging off, optimized, not reentrant.
+            </td>
+            <td class="na">
+              <b>8d</b>: Debugging off, optimized, not reentrant.
+            </td>
+            <td class="na">
+              <b>8D</b>: Debugging off, optimized, not reentrant.
+            </td>
+            <td class="na">
+              <b>8a</b>: Debugging off, optimized, not reentrant.
+            </td>
+            <td class="na">
+              <b>8A</b>: Debugging off, optimized, not reentrant.
+            </td>
+          </tr>
+          <tr>
+            <td class="header"><b>11</b><br>(debug)</td>
+            <td class="na">
+              <b>11s</b>: Debug, not optimized, not reentrant.
+            </td>
+            <td class="na">
+              <b>11S</b>: Debug, not optimized, not reentrant.
+            </td>
+            <td class="na">
+               <b>11d</b>: Debug, not optimized, not reentrant.
+            </td>
+            <td class="na">
+                <b>11D</b>: Debug, not optimized, not reentrant.
+            </td>
+            <td class="na">
+                <b>11a</b>: Debug, not optimized, not reentrant.
+            </td>
+            <td class="na">
+                <b>11A</b>: Debug, not optimized, not reentrant.
+            </td>
+          </tr>
+          <tr>
+            <td class="header"><b>12</b><br>(optimized)</td>
+            <td class="na">
+              <b>12s</b>: Debugging off, optimized, reentrant.
+            </td>
+            <td class="na">
+              <b>12S</b>: Debugging off, optimized, reentrant.
+            </td>
+            <td class="na">
+              <b>12d</b>: Debugging off, optimized, reentrant.
+            </td>
+            <td class="na">
+              <b>12D</b>: Debugging off, optimized, reentrant.
+            </td>
+            <td class="na">
+              <b>12a</b>: Debugging off, optimized, reentrant.
+            </td>
+            <td class="na">
+              <b>12A</b>: Debugging off, optimized, reentrant.
+            </td>
+          </tr>
+          <tr>
+            <td class="header"><b>15</b><br>(debug)</td>
+            <td class="na">
+               <b>15s</b>: Debug, not optimized, reentrant.
+            </td>
+            <td class="na">
+              <b>15S</b>: Debug, not optimized, reentrant.
+            </td>
+            <td class="na">
+              <b>15d</b>: Debug, not optimized, reentrant.
+            </td>
+            <td class="na">
+               <b>15D</b>: Debug, not optimized, reentrant.
+            </td>
+            <td class="na">
+               <b>15a</b>: Debug, not optimized, reentrant.
+            </td>
+            <td class="na">
+               <b>15A</b>: Debug, not optimized, reentrant.
+            </td>
+          </tr>
+        </tbody>
+    </table>
+  </body>
+</html>
+EOF
+
+######################################################################
+
+if [ -z $no_clean ]; then
+    # clean up
+    rm $awkscript $examples_file $tests_file $locales_file
+
+    for l in $textlogs; do
+        rm $l
+    done
+fi
diff --git a/configure.bat b/configure.bat
new file mode 100644
index 0000000..617e9d6
--- /dev/null
+++ b/configure.bat
@@ -0,0 +1,45 @@
+@echo off
+
+::
+:: Licensed to the Apache Software  Foundation (ASF) under one or more
+:: contributor  license agreements.  See  the NOTICE  file distributed
+:: with  this  work  for  additional information  regarding  copyright
+:: ownership.   The ASF  licenses this  file to  you under  the Apache
+:: License, Version  2.0 (the  "License"); you may  not use  this file
+:: except in  compliance with the License.   You may obtain  a copy of
+:: the License at
+::
+:: http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the  License is distributed on an  "AS IS" BASIS,
+:: WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+:: implied.   See  the License  for  the  specific language  governing
+:: permissions and limitations under the License.
+::
+:: Copyright 1999-2007 Rogue Wave Software, Inc.
+::
+
+set exedir=
+
+if exist %SystemRoot%\SysWow64\cscript.exe set exedir=%SystemRoot%\SysWow64\
+
+set ERRORLEVEL=0
+%exedir%cscript /? > nul
+if %errorlevel% neq 0 (
+echo "Windows scripting host is not installed. Please install it."
+set ERRORLEVEL=1
+goto :EOF
+)
+
+set scriptdir=etc\config\windows
+set rungen=generate.wsf
+
+set runfile=%~dp0\%scriptdir%\%rungen%
+
+%exedir%cscript /nologo %runfile% %*
+if %errorlevel% neq 0 (
+echo "Solution generation script failed."
+set ERRORLEVEL=1
+goto :EOF
+)
diff --git a/doc/index.html b/doc/index.html
index b0de4b3..d2a5ccb 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <html>
     <head>
         <title>Apache C++ Standard Library Documentation</title>
diff --git a/doc/rw.css b/doc/rw.css
index 77451fb..cb1788a 100755
--- a/doc/rw.css
+++ b/doc/rw.css
@@ -1,3 +1,23 @@
+<!--

+    Licensed to the Apache Software  Foundation (ASF) under one or more

+    contributor  license agreements.  See  the NOTICE  file distributed

+    with  this  work  for  additional information  regarding  copyright

+    ownership.   The ASF  licenses this  file to  you under  the Apache

+    License, Version  2.0 (the  License); you may  not use  this file

+    except in  compliance with the License.   You may obtain  a copy of

+    the License at

+

+    http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the  License is distributed on an  "AS IS" BASIS,

+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or

+    implied.   See  the License  for  the  specific language  governing

+    permissions and limitations under the License.

+

+    Copyright 1999-2007 Rogue Wave Software, Inc.

+-->

+

 BODY { font-family: arial, helvetica, sans-serif; font-size: 10pt }

 H1   { font-family: arial, helvetica, sans-serif; font-size: 16pt; line-height: 100%; font-weight: bold; color: #003399 }

 H2   { font-family: arial, helvetica, sans-serif; font-size: 14pt; line-height: 100%; font-weight: bold; color: #003399 }

diff --git a/doc/rwbanner.css b/doc/rwbanner.css
index ecd8a05..07f19af 100755
--- a/doc/rwbanner.css
+++ b/doc/rwbanner.css
@@ -1,3 +1,23 @@
+<!--

+    Licensed to the Apache Software  Foundation (ASF) under one or more

+    contributor  license agreements.  See  the NOTICE  file distributed

+    with  this  work  for  additional information  regarding  copyright

+    ownership.   The ASF  licenses this  file to  you under  the Apache

+    License, Version  2.0 (the  License); you may  not use  this file

+    except in  compliance with the License.   You may obtain  a copy of

+    the License at

+

+    http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the  License is distributed on an  "AS IS" BASIS,

+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or

+    implied.   See  the License  for  the  specific language  governing

+    permissions and limitations under the License.

+

+    Copyright 1999-2007 Rogue Wave Software, Inc.

+-->

+

 BODY { font-family: arial, helvetica, sans-serif }

 H2   { font-family: arial, helvetica, sans-serif ; font-size: 14pt; line-height: 100%; font-weight: bold; color: #003399 }

 H4   { font-family: arial, helvetica, sans-serif ; font-size: 10pt; line-height: 100%; font-weight: bold }

diff --git a/doc/stdlibref/--distance-type.html b/doc/stdlibref/--distance-type.html
index b9689e9..1cca176 100644
--- a/doc/stdlibref/--distance-type.html
+++ b/doc/stdlibref/--distance-type.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>__distance_type()</TITLE>
diff --git a/doc/stdlibref/--iterator-category.html b/doc/stdlibref/--iterator-category.html
index b223da4..a6cc028 100644
--- a/doc/stdlibref/--iterator-category.html
+++ b/doc/stdlibref/--iterator-category.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>__iterator_category()</TITLE>
diff --git a/doc/stdlibref/1-1.html b/doc/stdlibref/1-1.html
index 90465d2..5793cfa 100644
--- a/doc/stdlibref/1-1.html
+++ b/doc/stdlibref/1-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Contents of Entries</TITLE>
diff --git a/doc/stdlibref/1-2.html b/doc/stdlibref/1-2.html
index 1b07e51..e94a002 100644
--- a/doc/stdlibref/1-2.html
+++ b/doc/stdlibref/1-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Conventions</TITLE>
diff --git a/doc/stdlibref/1-3.html b/doc/stdlibref/1-3.html
index ecb6847..b8a632b 100644
--- a/doc/stdlibref/1-3.html
+++ b/doc/stdlibref/1-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Standards Conformance</TITLE>
diff --git a/doc/stdlibref/1.html b/doc/stdlibref/1.html
index 0dc6d7e..f4d258d 100644
--- a/doc/stdlibref/1.html
+++ b/doc/stdlibref/1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibref/2-1.html b/doc/stdlibref/2-1.html
index 4369ef1..3d95b7a 100644
--- a/doc/stdlibref/2-1.html
+++ b/doc/stdlibref/2-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Correlation with the Standard</TITLE>
diff --git a/doc/stdlibref/2-10.html b/doc/stdlibref/2-10.html
index 1195bba..7c1898c 100644
--- a/doc/stdlibref/2-10.html
+++ b/doc/stdlibref/2-10.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Numerics library</TITLE>
diff --git a/doc/stdlibref/2-11.html b/doc/stdlibref/2-11.html
index e42d8c6..c18dc55 100644
--- a/doc/stdlibref/2-11.html
+++ b/doc/stdlibref/2-11.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Input/output library</TITLE>
diff --git a/doc/stdlibref/2-2.html b/doc/stdlibref/2-2.html
index 743e7ae..347db3f 100644
--- a/doc/stdlibref/2-2.html
+++ b/doc/stdlibref/2-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Language support library</TITLE>
diff --git a/doc/stdlibref/2-3.html b/doc/stdlibref/2-3.html
index 3bb9172..3015372 100644
--- a/doc/stdlibref/2-3.html
+++ b/doc/stdlibref/2-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Diagnostics library</TITLE>
diff --git a/doc/stdlibref/2-4.html b/doc/stdlibref/2-4.html
index 323e29b..6722576 100644
--- a/doc/stdlibref/2-4.html
+++ b/doc/stdlibref/2-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>General utilities library</TITLE>
diff --git a/doc/stdlibref/2-5.html b/doc/stdlibref/2-5.html
index e5f3cc8..f461173 100644
--- a/doc/stdlibref/2-5.html
+++ b/doc/stdlibref/2-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Strings library</TITLE>
diff --git a/doc/stdlibref/2-6.html b/doc/stdlibref/2-6.html
index 41b4e1f..3056b34 100644
--- a/doc/stdlibref/2-6.html
+++ b/doc/stdlibref/2-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Localization library</TITLE>
diff --git a/doc/stdlibref/2-7.html b/doc/stdlibref/2-7.html
index 1944149..517cc88 100644
--- a/doc/stdlibref/2-7.html
+++ b/doc/stdlibref/2-7.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Containers library</TITLE>
diff --git a/doc/stdlibref/2-8.html b/doc/stdlibref/2-8.html
index ddf43e2..b007f2a 100644
--- a/doc/stdlibref/2-8.html
+++ b/doc/stdlibref/2-8.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Iterators library</TITLE>
diff --git a/doc/stdlibref/2-9.html b/doc/stdlibref/2-9.html
index 11e3084..91a170f 100644
--- a/doc/stdlibref/2-9.html
+++ b/doc/stdlibref/2-9.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Algorithms library</TITLE>
diff --git a/doc/stdlibref/2.html b/doc/stdlibref/2.html
index a5ecd8b..cffbbe0 100644
--- a/doc/stdlibref/2.html
+++ b/doc/stdlibref/2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Index of Libraries</TITLE>
diff --git a/doc/stdlibref/A-1.html b/doc/stdlibref/A-1.html
index 966f0ac..6f70b90 100644
--- a/doc/stdlibref/A-1.html
+++ b/doc/stdlibref/A-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Warnings</TITLE>
diff --git a/doc/stdlibref/A-2.html b/doc/stdlibref/A-2.html
index 148e076..bbf7f79 100644
--- a/doc/stdlibref/A-2.html
+++ b/doc/stdlibref/A-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Readmes</TITLE>
diff --git a/doc/stdlibref/A-3.html b/doc/stdlibref/A-3.html
index e90e99b..abd098b 100644
--- a/doc/stdlibref/A-3.html
+++ b/doc/stdlibref/A-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Implementation Classes</TITLE>
diff --git a/doc/stdlibref/A.html b/doc/stdlibref/A.html
index 08e455b..d9eee7f 100644
--- a/doc/stdlibref/A.html
+++ b/doc/stdlibref/A.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Implementation Details</TITLE>
diff --git a/doc/stdlibref/B.html b/doc/stdlibref/B.html
index c40dfdc..627ecbd 100644
--- a/doc/stdlibref/B.html
+++ b/doc/stdlibref/B.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Extensions to the C++ Standard</TITLE>
diff --git a/doc/stdlibref/I.html b/doc/stdlibref/I.html
index 07a3692..189fcee 100644
--- a/doc/stdlibref/I.html
+++ b/doc/stdlibref/I.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Introduction</TITLE>
diff --git a/doc/stdlibref/II.html b/doc/stdlibref/II.html
index be68410..a16133e 100644
--- a/doc/stdlibref/II.html
+++ b/doc/stdlibref/II.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Reference</TITLE>
diff --git a/doc/stdlibref/III.html b/doc/stdlibref/III.html
index 3a2326a..056e312 100644
--- a/doc/stdlibref/III.html
+++ b/doc/stdlibref/III.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Obsolete Classes Reference</TITLE>
diff --git a/doc/stdlibref/IV.html b/doc/stdlibref/IV.html
index 8b0821b..dcd0742 100644
--- a/doc/stdlibref/IV.html
+++ b/doc/stdlibref/IV.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Appendixes</TITLE>
diff --git a/doc/stdlibref/accumulate.html b/doc/stdlibref/accumulate.html
index f8b6a79..5915263 100644
--- a/doc/stdlibref/accumulate.html
+++ b/doc/stdlibref/accumulate.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>accumulate()</TITLE>
diff --git a/doc/stdlibref/acknow.html b/doc/stdlibref/acknow.html
index 3cdf318..29f9664 100644
--- a/doc/stdlibref/acknow.html
+++ b/doc/stdlibref/acknow.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Acknowledgments</TITLE>
diff --git a/doc/stdlibref/adjacent-difference.html b/doc/stdlibref/adjacent-difference.html
index f9d1293..9604301 100644
--- a/doc/stdlibref/adjacent-difference.html
+++ b/doc/stdlibref/adjacent-difference.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>adjacent_difference()</TITLE>
diff --git a/doc/stdlibref/adjacent-find.html b/doc/stdlibref/adjacent-find.html
index 6e156e5..e67dbc9 100644
--- a/doc/stdlibref/adjacent-find.html
+++ b/doc/stdlibref/adjacent-find.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>adjacent_find()</TITLE>
diff --git a/doc/stdlibref/advance.html b/doc/stdlibref/advance.html
index b523cb3..4145b29 100644
--- a/doc/stdlibref/advance.html
+++ b/doc/stdlibref/advance.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>advance()</TITLE>
diff --git a/doc/stdlibref/algorithm-h.html b/doc/stdlibref/algorithm-h.html
index 9a5592c..654a12e 100644
--- a/doc/stdlibref/algorithm-h.html
+++ b/doc/stdlibref/algorithm-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;algorithm&gt;</TITLE>
diff --git a/doc/stdlibref/algorithms.html b/doc/stdlibref/algorithms.html
index c22cdc1..e63869b 100644
--- a/doc/stdlibref/algorithms.html
+++ b/doc/stdlibref/algorithms.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Algorithms</TITLE>
diff --git a/doc/stdlibref/allocator.html b/doc/stdlibref/allocator.html
index dc2d1d8..40aa034 100644
--- a/doc/stdlibref/allocator.html
+++ b/doc/stdlibref/allocator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>allocator</TITLE>
diff --git a/doc/stdlibref/associativecontainers.html b/doc/stdlibref/associativecontainers.html
index fdfa830..9af2679 100644
--- a/doc/stdlibref/associativecontainers.html
+++ b/doc/stdlibref/associativecontainers.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Associative Containers</TITLE>
diff --git a/doc/stdlibref/auto-ptr.html b/doc/stdlibref/auto-ptr.html
index f16e7e1..3636272 100644
--- a/doc/stdlibref/auto-ptr.html
+++ b/doc/stdlibref/auto-ptr.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>auto_ptr</TITLE>
diff --git a/doc/stdlibref/back-insert-iterator.html b/doc/stdlibref/back-insert-iterator.html
index 46f474e..4c12ba4 100644
--- a/doc/stdlibref/back-insert-iterator.html
+++ b/doc/stdlibref/back-insert-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>back_insert_iterator, back_inserter()</TITLE>
diff --git a/doc/stdlibref/bad-alloc.html b/doc/stdlibref/bad-alloc.html
index c2e4afe..2516890 100644
--- a/doc/stdlibref/bad-alloc.html
+++ b/doc/stdlibref/bad-alloc.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>bad_alloc</TITLE>
diff --git a/doc/stdlibref/bad-cast.html b/doc/stdlibref/bad-cast.html
index 570ef49..5085154 100644
--- a/doc/stdlibref/bad-cast.html
+++ b/doc/stdlibref/bad-cast.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>bad_cast</TITLE>
diff --git a/doc/stdlibref/bad-exception.html b/doc/stdlibref/bad-exception.html
index b532989..1a8bce0 100644
--- a/doc/stdlibref/bad-exception.html
+++ b/doc/stdlibref/bad-exception.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>bad_exception</TITLE>
diff --git a/doc/stdlibref/bad-typeid.html b/doc/stdlibref/bad-typeid.html
index 978e4a6..c82f209 100644
--- a/doc/stdlibref/bad-typeid.html
+++ b/doc/stdlibref/bad-typeid.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>bad_typeid</TITLE>
diff --git a/doc/stdlibref/basic-filebuf.html b/doc/stdlibref/basic-filebuf.html
index d9fb9fa..be0d5e7 100644
--- a/doc/stdlibref/basic-filebuf.html
+++ b/doc/stdlibref/basic-filebuf.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_filebuf</TITLE>
@@ -33,6 +53,7 @@
 <A HREF="#idx40">char_type</A><BR>
 <A HREF="#idx52">close()</A><BR>
 <A HREF="#idx53">detach()</A><BR>
+<A HREF="#idx66">fd()</A><BR>
 </TD>
 <TD VALIGN=top><A HREF="#idx41">int_type</A><BR>
 <A HREF="#idx54">is_open()</A><BR>
@@ -120,6 +141,8 @@
     basic_filebuf&lt;charT, traits&gt;* attach(int);
     int detach();
 
+    int fd() const;
+
     basic_filebuf&lt;charT, traits&gt;* close();
 
    protected:
@@ -235,7 +258,18 @@
 </UL>
 
 <BLOCKQUOTE><HR><B>
-NOTE -- <B>This function is not part of the C++ Standard, but is provided as an extension of this implementation for compatibility with Classic Iostreams. See </B><A HREF="B.html">Appendix&nbsp;B</A><B> for a complete list of extensions of this implementation.
+NOTE -- This function is not part of the C++ Standard, but is provided as an extension of this implementation for compatibility with Classic Iostreams. See </B><A HREF="B.html">Appendix&nbsp;B</A><B> for a complete list of extensions of this implementation.
+</B><HR></BLOCKQUOTE>
+
+
+<A NAME="idx66"></A><PRE>int
+<B>fd</B>() const;</PRE>
+<UL>
+<P>If <SAMP>is_open()</SAMP> returns <SAMP>true</SAMP>, returns the associated file descriptor, otherwise -1.</P>
+</UL>
+
+<BLOCKQUOTE><HR><B>
+NOTE -- This function is not part of the C++ Standard, but is provided as an extension of this implementation for compatibility with Classic Iostreams. See </B><A HREF="B.html">Appendix&nbsp;B</A><B> for a complete list of extensions of this implementation.
 </B><HR></BLOCKQUOTE>
 
 <A NAME="idx52"></A><PRE>
diff --git a/doc/stdlibref/basic-fstream.html b/doc/stdlibref/basic-fstream.html
index a6a74b9..4602f8d 100644
--- a/doc/stdlibref/basic-fstream.html
+++ b/doc/stdlibref/basic-fstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_fstream</TITLE>
diff --git a/doc/stdlibref/basic-ifstream.html b/doc/stdlibref/basic-ifstream.html
index 0c4f758..9e0f8aa 100644
--- a/doc/stdlibref/basic-ifstream.html
+++ b/doc/stdlibref/basic-ifstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_ifstream</TITLE>
diff --git a/doc/stdlibref/basic-ios.html b/doc/stdlibref/basic-ios.html
index 6f02459..de9ac78 100644
--- a/doc/stdlibref/basic-ios.html
+++ b/doc/stdlibref/basic-ios.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_ios</TITLE>
diff --git a/doc/stdlibref/basic-iostream.html b/doc/stdlibref/basic-iostream.html
index 267e3d2..f947595 100644
--- a/doc/stdlibref/basic-iostream.html
+++ b/doc/stdlibref/basic-iostream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_iostream</TITLE>
diff --git a/doc/stdlibref/basic-istream.html b/doc/stdlibref/basic-istream.html
index 6ed6200..55efabe 100644
--- a/doc/stdlibref/basic-istream.html
+++ b/doc/stdlibref/basic-istream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_istream</TITLE>
diff --git a/doc/stdlibref/basic-istringstream.html b/doc/stdlibref/basic-istringstream.html
index 06dbdd5..acc15dd 100644
--- a/doc/stdlibref/basic-istringstream.html
+++ b/doc/stdlibref/basic-istringstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_istringstream</TITLE>
diff --git a/doc/stdlibref/basic-ofstream.html b/doc/stdlibref/basic-ofstream.html
index caa7e01..b1556dc 100644
--- a/doc/stdlibref/basic-ofstream.html
+++ b/doc/stdlibref/basic-ofstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_ofstream</TITLE>
diff --git a/doc/stdlibref/basic-ostream.html b/doc/stdlibref/basic-ostream.html
index 15ad84a..9d4c804 100644
--- a/doc/stdlibref/basic-ostream.html
+++ b/doc/stdlibref/basic-ostream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_ostream</TITLE>
diff --git a/doc/stdlibref/basic-ostringstream.html b/doc/stdlibref/basic-ostringstream.html
index 1f25401..1d14316 100644
--- a/doc/stdlibref/basic-ostringstream.html
+++ b/doc/stdlibref/basic-ostringstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_ostringstream</TITLE>
diff --git a/doc/stdlibref/basic-streambuf.html b/doc/stdlibref/basic-streambuf.html
index 899ac79..a698990 100644
--- a/doc/stdlibref/basic-streambuf.html
+++ b/doc/stdlibref/basic-streambuf.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_streambuf</TITLE>
diff --git a/doc/stdlibref/basic-string.html b/doc/stdlibref/basic-string.html
index b1ce921..dd9aa77 100644
--- a/doc/stdlibref/basic-string.html
+++ b/doc/stdlibref/basic-string.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_string</TITLE>
diff --git a/doc/stdlibref/basic-stringbuf.html b/doc/stdlibref/basic-stringbuf.html
index 5f87c67..e88640f 100644
--- a/doc/stdlibref/basic-stringbuf.html
+++ b/doc/stdlibref/basic-stringbuf.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_stringbuf</TITLE>
diff --git a/doc/stdlibref/basic-stringstream.html b/doc/stdlibref/basic-stringstream.html
index f8b1903..0877270 100644
--- a/doc/stdlibref/basic-stringstream.html
+++ b/doc/stdlibref/basic-stringstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>basic_stringstream</TITLE>
diff --git a/doc/stdlibref/bidirectionaliterators.html b/doc/stdlibref/bidirectionaliterators.html
index 3480469..a26e31b 100644
--- a/doc/stdlibref/bidirectionaliterators.html
+++ b/doc/stdlibref/bidirectionaliterators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Bidirectional Iterators</TITLE>
diff --git a/doc/stdlibref/binary-function.html b/doc/stdlibref/binary-function.html
index a17b5ba..4bcb1a8 100644
--- a/doc/stdlibref/binary-function.html
+++ b/doc/stdlibref/binary-function.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>binary_function</TITLE>
diff --git a/doc/stdlibref/binary-negate.html b/doc/stdlibref/binary-negate.html
index ea739e0..50fb42f 100644
--- a/doc/stdlibref/binary-negate.html
+++ b/doc/stdlibref/binary-negate.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>binary_negate</TITLE>
diff --git a/doc/stdlibref/binary-search.html b/doc/stdlibref/binary-search.html
index baaa1ad..5764f68 100644
--- a/doc/stdlibref/binary-search.html
+++ b/doc/stdlibref/binary-search.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>binary_search()</TITLE>
diff --git a/doc/stdlibref/bind1st.html b/doc/stdlibref/bind1st.html
index dbd01f0..89443cf 100644
--- a/doc/stdlibref/bind1st.html
+++ b/doc/stdlibref/bind1st.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>bind1st(), bind2nd(), binder1st, binder2nd</TITLE>
diff --git a/doc/stdlibref/bitmasktypes.html b/doc/stdlibref/bitmasktypes.html
index 4732ca1..85ad7ed 100644
--- a/doc/stdlibref/bitmasktypes.html
+++ b/doc/stdlibref/bitmasktypes.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Bitmask Types</TITLE>
diff --git a/doc/stdlibref/bitset.html b/doc/stdlibref/bitset.html
index e9f437a..751d8b8 100644
--- a/doc/stdlibref/bitset.html
+++ b/doc/stdlibref/bitset.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>bitset</TITLE>
diff --git a/doc/stdlibref/booktoc.html b/doc/stdlibref/booktoc.html
index 78c5b8d..5d4f53c 100644
--- a/doc/stdlibref/booktoc.html
+++ b/doc/stdlibref/booktoc.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Alphabetical List of Descriptions</TITLE>
diff --git a/doc/stdlibref/cerr.html b/doc/stdlibref/cerr.html
index e2cde8d..91311d8 100644
--- a/doc/stdlibref/cerr.html
+++ b/doc/stdlibref/cerr.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>cerr</TITLE>
diff --git a/doc/stdlibref/char-traits.html b/doc/stdlibref/char-traits.html
index 3885f6b..408b05c 100644
--- a/doc/stdlibref/char-traits.html
+++ b/doc/stdlibref/char-traits.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>char_traits</TITLE>
diff --git a/doc/stdlibref/cin.html b/doc/stdlibref/cin.html
index a81070c..70169bb 100644
--- a/doc/stdlibref/cin.html
+++ b/doc/stdlibref/cin.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>cin</TITLE>
diff --git a/doc/stdlibref/clog.html b/doc/stdlibref/clog.html
index 267105d..47f3747 100644
--- a/doc/stdlibref/clog.html
+++ b/doc/stdlibref/clog.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>clog</TITLE>
diff --git a/doc/stdlibref/codecvt-byname.html b/doc/stdlibref/codecvt-byname.html
index 6fb3111..97167a2 100644
--- a/doc/stdlibref/codecvt-byname.html
+++ b/doc/stdlibref/codecvt-byname.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>codecvt_byname</TITLE>
diff --git a/doc/stdlibref/codecvt.html b/doc/stdlibref/codecvt.html
index d58127d..bf818f2 100644
--- a/doc/stdlibref/codecvt.html
+++ b/doc/stdlibref/codecvt.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>codecvt</TITLE>
diff --git a/doc/stdlibref/collate.html b/doc/stdlibref/collate.html
index a50240b..9093dd9 100644
--- a/doc/stdlibref/collate.html
+++ b/doc/stdlibref/collate.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>collate, collate_byname</TITLE>
diff --git a/doc/stdlibref/compare.html b/doc/stdlibref/compare.html
index b013c22..fa8d21e 100644
--- a/doc/stdlibref/compare.html
+++ b/doc/stdlibref/compare.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>compare</TITLE>
diff --git a/doc/stdlibref/complex-h.html b/doc/stdlibref/complex-h.html
index c4b39d5..ca413e1 100644
--- a/doc/stdlibref/complex-h.html
+++ b/doc/stdlibref/complex-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;complex&gt;</TITLE>
diff --git a/doc/stdlibref/complex.html b/doc/stdlibref/complex.html
index 806576e..e725da0 100644
--- a/doc/stdlibref/complex.html
+++ b/doc/stdlibref/complex.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>complex</TITLE>
diff --git a/doc/stdlibref/contact.html b/doc/stdlibref/contact.html
index 21b12dd..b029a81 100644
--- a/doc/stdlibref/contact.html
+++ b/doc/stdlibref/contact.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Contacting Rogue Wave</TITLE>
diff --git a/doc/stdlibref/containers.html b/doc/stdlibref/containers.html
index 4c37721..30d6c54 100644
--- a/doc/stdlibref/containers.html
+++ b/doc/stdlibref/containers.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Containers</TITLE>
diff --git a/doc/stdlibref/copy.html b/doc/stdlibref/copy.html
index 9047d51..727238e 100644
--- a/doc/stdlibref/copy.html
+++ b/doc/stdlibref/copy.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>copy(), copy_backward()</TITLE>
diff --git a/doc/stdlibref/copyright.html b/doc/stdlibref/copyright.html
index 3661ab5..20353cc 100644
--- a/doc/stdlibref/copyright.html
+++ b/doc/stdlibref/copyright.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Copyright Information</TITLE>
diff --git a/doc/stdlibref/count.html b/doc/stdlibref/count.html
index 6200168..7f89ee3 100644
--- a/doc/stdlibref/count.html
+++ b/doc/stdlibref/count.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>count(), count_if()</TITLE>
diff --git a/doc/stdlibref/cout.html b/doc/stdlibref/cout.html
index cc5118b..da58a4f 100644
--- a/doc/stdlibref/cout.html
+++ b/doc/stdlibref/cout.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>cout</TITLE>
diff --git a/doc/stdlibref/ctype-byname.html b/doc/stdlibref/ctype-byname.html
index 7182c45..7aa41a5 100644
--- a/doc/stdlibref/ctype-byname.html
+++ b/doc/stdlibref/ctype-byname.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ctype_byname</TITLE>
diff --git a/doc/stdlibref/ctype.html b/doc/stdlibref/ctype.html
index 7eb8e84..2053d9c 100644
--- a/doc/stdlibref/ctype.html
+++ b/doc/stdlibref/ctype.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ctype</TITLE>
diff --git a/doc/stdlibref/deque-h.html b/doc/stdlibref/deque-h.html
index 8d8ad47..c0a0899 100644
--- a/doc/stdlibref/deque-h.html
+++ b/doc/stdlibref/deque-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;deque&gt;</TITLE>
diff --git a/doc/stdlibref/deque.html b/doc/stdlibref/deque.html
index 204a69a..b462dfa 100644
--- a/doc/stdlibref/deque.html
+++ b/doc/stdlibref/deque.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>deque</TITLE>
diff --git a/doc/stdlibref/distance.html b/doc/stdlibref/distance.html
index 373f060..1e532fe 100644
--- a/doc/stdlibref/distance.html
+++ b/doc/stdlibref/distance.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>distance()</TITLE>
diff --git a/doc/stdlibref/divides.html b/doc/stdlibref/divides.html
index 8dd5ac4..f1d31bf 100644
--- a/doc/stdlibref/divides.html
+++ b/doc/stdlibref/divides.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>divides</TITLE>
diff --git a/doc/stdlibref/domain-error.html b/doc/stdlibref/domain-error.html
index c905a58..6163de5 100644
--- a/doc/stdlibref/domain-error.html
+++ b/doc/stdlibref/domain-error.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>domain_error</TITLE>
diff --git a/doc/stdlibref/equal-range.html b/doc/stdlibref/equal-range.html
index 57704f4..2f5bc88 100644
--- a/doc/stdlibref/equal-range.html
+++ b/doc/stdlibref/equal-range.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>equal_range()</TITLE>
diff --git a/doc/stdlibref/equal-to.html b/doc/stdlibref/equal-to.html
index 77d4dd4..2b93b8e 100644
--- a/doc/stdlibref/equal-to.html
+++ b/doc/stdlibref/equal-to.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>equal_to</TITLE>
diff --git a/doc/stdlibref/equal.html b/doc/stdlibref/equal.html
index b4070f8..412185d 100644
--- a/doc/stdlibref/equal.html
+++ b/doc/stdlibref/equal.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>equal()</TITLE>
diff --git a/doc/stdlibref/exception-h.html b/doc/stdlibref/exception-h.html
index 5632813..814103c 100644
--- a/doc/stdlibref/exception-h.html
+++ b/doc/stdlibref/exception-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;exception&gt;</TITLE>
diff --git a/doc/stdlibref/exception.html b/doc/stdlibref/exception.html
index 124f260..5eb7ce3 100644
--- a/doc/stdlibref/exception.html
+++ b/doc/stdlibref/exception.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>exception</TITLE>
diff --git a/doc/stdlibref/exceptions.html b/doc/stdlibref/exceptions.html
index 2ccba34..815ad79 100644
--- a/doc/stdlibref/exceptions.html
+++ b/doc/stdlibref/exceptions.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Exceptions</TITLE>
diff --git a/doc/stdlibref/facets.html b/doc/stdlibref/facets.html
index db6bdad..caba019 100644
--- a/doc/stdlibref/facets.html
+++ b/doc/stdlibref/facets.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Facets</TITLE>
diff --git a/doc/stdlibref/fill.html b/doc/stdlibref/fill.html
index 3dc3092..9fde096 100644
--- a/doc/stdlibref/fill.html
+++ b/doc/stdlibref/fill.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>fill(), fill_n()</TITLE>
diff --git a/doc/stdlibref/find-end.html b/doc/stdlibref/find-end.html
index e830b3a..fc1d724 100644
--- a/doc/stdlibref/find-end.html
+++ b/doc/stdlibref/find-end.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>find_end()</TITLE>
diff --git a/doc/stdlibref/find-first-of.html b/doc/stdlibref/find-first-of.html
index 0752d66..254dde3 100644
--- a/doc/stdlibref/find-first-of.html
+++ b/doc/stdlibref/find-first-of.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>find_first_of()</TITLE>
diff --git a/doc/stdlibref/find-if.html b/doc/stdlibref/find-if.html
index 127fe0c..b6dfd69 100644
--- a/doc/stdlibref/find-if.html
+++ b/doc/stdlibref/find-if.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>find_if()</TITLE>
diff --git a/doc/stdlibref/find.html b/doc/stdlibref/find.html
index e341ae9..260887a 100644
--- a/doc/stdlibref/find.html
+++ b/doc/stdlibref/find.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>find()</TITLE>
diff --git a/doc/stdlibref/for-each.html b/doc/stdlibref/for-each.html
index 297a5c0..83ecdd5 100644
--- a/doc/stdlibref/for-each.html
+++ b/doc/stdlibref/for-each.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>for_each()</TITLE>
diff --git a/doc/stdlibref/forwarditerators.html b/doc/stdlibref/forwarditerators.html
index e3f0a2d..673d58b 100644
--- a/doc/stdlibref/forwarditerators.html
+++ b/doc/stdlibref/forwarditerators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Forward Iterators</TITLE>
diff --git a/doc/stdlibref/fpos.html b/doc/stdlibref/fpos.html
index 6c2af0d..3fcf1cf 100644
--- a/doc/stdlibref/fpos.html
+++ b/doc/stdlibref/fpos.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>fpos</TITLE>
diff --git a/doc/stdlibref/frames-banner.html b/doc/stdlibref/frames-banner.html
index 6d369f9..9188021 100644
--- a/doc/stdlibref/frames-banner.html
+++ b/doc/stdlibref/frames-banner.html
@@ -1,4 +1,24 @@
-<html>
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
+<HTML>
     <head>
         <title>Top navigation banner</title>
         <link rel=StyleSheet
diff --git a/doc/stdlibref/frames-classes-alpha.html b/doc/stdlibref/frames-classes-alpha.html
index 43bb4e6..b7d5af4 100644
--- a/doc/stdlibref/frames-classes-alpha.html
+++ b/doc/stdlibref/frames-classes-alpha.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Alphabetical List of Descriptions</TITLE>
diff --git a/doc/stdlibref/frames-classes-func.html b/doc/stdlibref/frames-classes-func.html
index 532b2be..f6565f9 100644
--- a/doc/stdlibref/frames-classes-func.html
+++ b/doc/stdlibref/frames-classes-func.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Functional List of Descriptions</TITLE>
diff --git a/doc/stdlibref/frames-displayarea.html b/doc/stdlibref/frames-displayarea.html
index ca357f1..cf06639 100644
--- a/doc/stdlibref/frames-displayarea.html
+++ b/doc/stdlibref/frames-displayarea.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Display area frameset</TITLE>
diff --git a/doc/stdlibref/frames-intro-contents.html b/doc/stdlibref/frames-intro-contents.html
index 3b8d27c..4f3f959 100644
--- a/doc/stdlibref/frames-intro-contents.html
+++ b/doc/stdlibref/frames-intro-contents.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Introduction Contents</TITLE>
diff --git a/doc/stdlibref/frames-intro-text.html b/doc/stdlibref/frames-intro-text.html
index 49a60eb..8e4e032 100644
--- a/doc/stdlibref/frames-intro-text.html
+++ b/doc/stdlibref/frames-intro-text.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Welcome</TITLE>
diff --git a/doc/stdlibref/frames-tindex-contents.html b/doc/stdlibref/frames-tindex-contents.html
index 7455ca7..21464f2 100644
--- a/doc/stdlibref/frames-tindex-contents.html
+++ b/doc/stdlibref/frames-tindex-contents.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Frame-based index contents frame</TITLE>
diff --git a/doc/stdlibref/frames-tindex.html b/doc/stdlibref/frames-tindex.html
index 7333a0a..258af70 100644
--- a/doc/stdlibref/frames-tindex.html
+++ b/doc/stdlibref/frames-tindex.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Index frameset</TITLE>
diff --git a/doc/stdlibref/front-insert-iterator.html b/doc/stdlibref/front-insert-iterator.html
index 397d67c..5cb3c0e 100644
--- a/doc/stdlibref/front-insert-iterator.html
+++ b/doc/stdlibref/front-insert-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>front_insert_iterator, front_inserter()</TITLE>
diff --git a/doc/stdlibref/fstream-h.html b/doc/stdlibref/fstream-h.html
index e0d21ec..c4be302 100644
--- a/doc/stdlibref/fstream-h.html
+++ b/doc/stdlibref/fstream-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;fstream&gt;</TITLE>
diff --git a/doc/stdlibref/functional-h.html b/doc/stdlibref/functional-h.html
index 467b8a3..71a667c 100644
--- a/doc/stdlibref/functional-h.html
+++ b/doc/stdlibref/functional-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;functional&gt;</TITLE>
diff --git a/doc/stdlibref/functionobjects.html b/doc/stdlibref/functionobjects.html
index af31b90..931bd2a 100644
--- a/doc/stdlibref/functionobjects.html
+++ b/doc/stdlibref/functionobjects.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Function Objects</TITLE>
diff --git a/doc/stdlibref/functoc.html b/doc/stdlibref/functoc.html
index 29091df..b8ac9e2 100644
--- a/doc/stdlibref/functoc.html
+++ b/doc/stdlibref/functoc.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Functional List of Class Descriptions</TITLE>
diff --git a/doc/stdlibref/generate.html b/doc/stdlibref/generate.html
index aba0953..d159231 100644
--- a/doc/stdlibref/generate.html
+++ b/doc/stdlibref/generate.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>generate(), generate_n()</TITLE>
diff --git a/doc/stdlibref/get-temporary-buffer.html b/doc/stdlibref/get-temporary-buffer.html
index 684498a..bea7906 100644
--- a/doc/stdlibref/get-temporary-buffer.html
+++ b/doc/stdlibref/get-temporary-buffer.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>get_temporary_buffer()</TITLE>
diff --git a/doc/stdlibref/greater-equal.html b/doc/stdlibref/greater-equal.html
index 81ba7bb..4bccc9b 100644
--- a/doc/stdlibref/greater-equal.html
+++ b/doc/stdlibref/greater-equal.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>greater_equal</TITLE>
diff --git a/doc/stdlibref/greater.html b/doc/stdlibref/greater.html
index 6e6afd4..b0ba2bc 100644
--- a/doc/stdlibref/greater.html
+++ b/doc/stdlibref/greater.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>greater</TITLE>
diff --git a/doc/stdlibref/gslice-array.html b/doc/stdlibref/gslice-array.html
index fa5593f..d10a6a4 100644
--- a/doc/stdlibref/gslice-array.html
+++ b/doc/stdlibref/gslice-array.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>gslice_array</TITLE>
diff --git a/doc/stdlibref/gslice.html b/doc/stdlibref/gslice.html
index 23aa24c..2d8f3da 100644
--- a/doc/stdlibref/gslice.html
+++ b/doc/stdlibref/gslice.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>gslice</TITLE>
diff --git a/doc/stdlibref/has-facet.html b/doc/stdlibref/has-facet.html
index 541f199..f58ef93 100644
--- a/doc/stdlibref/has-facet.html
+++ b/doc/stdlibref/has-facet.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>has_facet()</TITLE>
diff --git a/doc/stdlibref/heapoperations.html b/doc/stdlibref/heapoperations.html
index 99ea5c1..afe1f7d 100644
--- a/doc/stdlibref/heapoperations.html
+++ b/doc/stdlibref/heapoperations.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Heap Operations</TITLE>
diff --git a/doc/stdlibref/includes.html b/doc/stdlibref/includes.html
index ac02c92..788c6f1 100644
--- a/doc/stdlibref/includes.html
+++ b/doc/stdlibref/includes.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>includes()</TITLE>
diff --git a/doc/stdlibref/index.html b/doc/stdlibref/index.html
index 1e0aff4..12e05b8 100644
--- a/doc/stdlibref/index.html
+++ b/doc/stdlibref/index.html
@@ -1,4 +1,24 @@
-<html>
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
+<HTML>
     <head>
         <title>Apache C++ Standard Library Class Reference</title>
         <link rel=StyleSheet
diff --git a/doc/stdlibref/indirect-array.html b/doc/stdlibref/indirect-array.html
index be3773c..af4ddda 100644
--- a/doc/stdlibref/indirect-array.html
+++ b/doc/stdlibref/indirect-array.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>indirect_array</TITLE>
diff --git a/doc/stdlibref/inner-product.html b/doc/stdlibref/inner-product.html
index a0af263..7775634 100644
--- a/doc/stdlibref/inner-product.html
+++ b/doc/stdlibref/inner-product.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>inner_product()</TITLE>
diff --git a/doc/stdlibref/inplace-merge.html b/doc/stdlibref/inplace-merge.html
index a78efa3..4a5cb84 100644
--- a/doc/stdlibref/inplace-merge.html
+++ b/doc/stdlibref/inplace-merge.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>inplace_merge()</TITLE>
diff --git a/doc/stdlibref/inputiterators.html b/doc/stdlibref/inputiterators.html
index ea077e4..46bb94e 100644
--- a/doc/stdlibref/inputiterators.html
+++ b/doc/stdlibref/inputiterators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Input Iterators</TITLE>
diff --git a/doc/stdlibref/insert-iterator.html b/doc/stdlibref/insert-iterator.html
index cca149a..ddb66ed 100644
--- a/doc/stdlibref/insert-iterator.html
+++ b/doc/stdlibref/insert-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>insert_iterator, inserter()</TITLE>
diff --git a/doc/stdlibref/insertiterators.html b/doc/stdlibref/insertiterators.html
index c319861..2197268 100644
--- a/doc/stdlibref/insertiterators.html
+++ b/doc/stdlibref/insertiterators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Insert Iterators</TITLE>
diff --git a/doc/stdlibref/invalid-argument.html b/doc/stdlibref/invalid-argument.html
index 0f079f3..3390927 100644
--- a/doc/stdlibref/invalid-argument.html
+++ b/doc/stdlibref/invalid-argument.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>invalid_argument</TITLE>
diff --git a/doc/stdlibref/iomanip-h.html b/doc/stdlibref/iomanip-h.html
index 6551bd1..306d4b0 100644
--- a/doc/stdlibref/iomanip-h.html
+++ b/doc/stdlibref/iomanip-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;iomanip&gt;</TITLE>
diff --git a/doc/stdlibref/ios-base--failure.html b/doc/stdlibref/ios-base--failure.html
index 1fc7432..23f86a7 100644
--- a/doc/stdlibref/ios-base--failure.html
+++ b/doc/stdlibref/ios-base--failure.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ios_base::failure</TITLE>
diff --git a/doc/stdlibref/ios-base.html b/doc/stdlibref/ios-base.html
index eea23bb..7078717 100644
--- a/doc/stdlibref/ios-base.html
+++ b/doc/stdlibref/ios-base.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ios_base</TITLE>
diff --git a/doc/stdlibref/ios-h.html b/doc/stdlibref/ios-h.html
index 5777d7b..5ac3101 100644
--- a/doc/stdlibref/ios-h.html
+++ b/doc/stdlibref/ios-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;ios&gt;</TITLE>
diff --git a/doc/stdlibref/iosfwd-h.html b/doc/stdlibref/iosfwd-h.html
index 3d17e6d..c62136a 100644
--- a/doc/stdlibref/iosfwd-h.html
+++ b/doc/stdlibref/iosfwd-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;iosfwd&gt;</TITLE>
diff --git a/doc/stdlibref/iostream-h.html b/doc/stdlibref/iostream-h.html
index 6a3213d..cd700b4 100644
--- a/doc/stdlibref/iostream-h.html
+++ b/doc/stdlibref/iostream-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;iostream&gt;</TITLE>
diff --git a/doc/stdlibref/isalnum.html b/doc/stdlibref/isalnum.html
index b3011b0..6eb78d0 100644
--- a/doc/stdlibref/isalnum.html
+++ b/doc/stdlibref/isalnum.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isalnum()</TITLE>
diff --git a/doc/stdlibref/isalpha.html b/doc/stdlibref/isalpha.html
index a8debcc..42ce618 100644
--- a/doc/stdlibref/isalpha.html
+++ b/doc/stdlibref/isalpha.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isalpha()</TITLE>
diff --git a/doc/stdlibref/iscntrl.html b/doc/stdlibref/iscntrl.html
index 16c9eff..e2e8507 100644
--- a/doc/stdlibref/iscntrl.html
+++ b/doc/stdlibref/iscntrl.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>iscntrl()</TITLE>
diff --git a/doc/stdlibref/isdigit.html b/doc/stdlibref/isdigit.html
index 78b4aa2..0d6d1ac 100644
--- a/doc/stdlibref/isdigit.html
+++ b/doc/stdlibref/isdigit.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isdigit()</TITLE>
diff --git a/doc/stdlibref/isgraph.html b/doc/stdlibref/isgraph.html
index a8b7588..ea98059 100644
--- a/doc/stdlibref/isgraph.html
+++ b/doc/stdlibref/isgraph.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isgraph()</TITLE>
diff --git a/doc/stdlibref/islower.html b/doc/stdlibref/islower.html
index a78ba11..548bfc5 100644
--- a/doc/stdlibref/islower.html
+++ b/doc/stdlibref/islower.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>islower()</TITLE>
diff --git a/doc/stdlibref/isprint.html b/doc/stdlibref/isprint.html
index d2b6d91..2c053e3 100644
--- a/doc/stdlibref/isprint.html
+++ b/doc/stdlibref/isprint.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isprint()</TITLE>
diff --git a/doc/stdlibref/ispunct.html b/doc/stdlibref/ispunct.html
index 21b537d..b16eaa3 100644
--- a/doc/stdlibref/ispunct.html
+++ b/doc/stdlibref/ispunct.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ispunct()</TITLE>
diff --git a/doc/stdlibref/isspace.html b/doc/stdlibref/isspace.html
index a787881..9c2b59f 100644
--- a/doc/stdlibref/isspace.html
+++ b/doc/stdlibref/isspace.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isspace()</TITLE>
diff --git a/doc/stdlibref/istream-h.html b/doc/stdlibref/istream-h.html
index c0159ad..2e40a25 100644
--- a/doc/stdlibref/istream-h.html
+++ b/doc/stdlibref/istream-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;istream&gt;</TITLE>
diff --git a/doc/stdlibref/istream-iterator.html b/doc/stdlibref/istream-iterator.html
index 9fb38aa..34d1032 100644
--- a/doc/stdlibref/istream-iterator.html
+++ b/doc/stdlibref/istream-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>istream_iterator</TITLE>
diff --git a/doc/stdlibref/istreambuf-iterator.html b/doc/stdlibref/istreambuf-iterator.html
index dd0cfb5..b6dbbb3 100644
--- a/doc/stdlibref/istreambuf-iterator.html
+++ b/doc/stdlibref/istreambuf-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>istreambuf_iterator</TITLE>
diff --git a/doc/stdlibref/istrstream.html b/doc/stdlibref/istrstream.html
index df923d5..e563a3f 100644
--- a/doc/stdlibref/istrstream.html
+++ b/doc/stdlibref/istrstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>istrstream</TITLE>
diff --git a/doc/stdlibref/isupper.html b/doc/stdlibref/isupper.html
index 63580cd..980b4f8 100644
--- a/doc/stdlibref/isupper.html
+++ b/doc/stdlibref/isupper.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isupper()</TITLE>
diff --git a/doc/stdlibref/isxdigit.html b/doc/stdlibref/isxdigit.html
index a9e1d61..162119a 100644
--- a/doc/stdlibref/isxdigit.html
+++ b/doc/stdlibref/isxdigit.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>isxdigit()</TITLE>
diff --git a/doc/stdlibref/iter-swap.html b/doc/stdlibref/iter-swap.html
index 83d96ca..c10fa3c 100644
--- a/doc/stdlibref/iter-swap.html
+++ b/doc/stdlibref/iter-swap.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>iter_swap()</TITLE>
diff --git a/doc/stdlibref/iterator-h.html b/doc/stdlibref/iterator-h.html
index 4cb35c4..dbefae0 100644
--- a/doc/stdlibref/iterator-h.html
+++ b/doc/stdlibref/iterator-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;iterator&gt;</TITLE>
diff --git a/doc/stdlibref/iterator-traits.html b/doc/stdlibref/iterator-traits.html
index d8944ec..ec29081 100644
--- a/doc/stdlibref/iterator-traits.html
+++ b/doc/stdlibref/iterator-traits.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>iterator_traits</TITLE>
diff --git a/doc/stdlibref/iterator.html b/doc/stdlibref/iterator.html
index a0795e6..07d9904 100644
--- a/doc/stdlibref/iterator.html
+++ b/doc/stdlibref/iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>iterator</TITLE>
diff --git a/doc/stdlibref/iterators.html b/doc/stdlibref/iterators.html
index 7496a27..bdf3d97 100644
--- a/doc/stdlibref/iterators.html
+++ b/doc/stdlibref/iterators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Iterators</TITLE>
diff --git a/doc/stdlibref/length-error.html b/doc/stdlibref/length-error.html
index 36d83a1..df669f4 100644
--- a/doc/stdlibref/length-error.html
+++ b/doc/stdlibref/length-error.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>length_error</TITLE>
diff --git a/doc/stdlibref/less-equal.html b/doc/stdlibref/less-equal.html
index 229bd5f..47aeed4 100644
--- a/doc/stdlibref/less-equal.html
+++ b/doc/stdlibref/less-equal.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>less_equal</TITLE>
diff --git a/doc/stdlibref/less.html b/doc/stdlibref/less.html
index 1aecf24..3667b55 100644
--- a/doc/stdlibref/less.html
+++ b/doc/stdlibref/less.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>less</TITLE>
diff --git a/doc/stdlibref/lexicographical-compare.html b/doc/stdlibref/lexicographical-compare.html
index 1d84a5e..b6455f3 100644
--- a/doc/stdlibref/lexicographical-compare.html
+++ b/doc/stdlibref/lexicographical-compare.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>lexicographical_compare()</TITLE>
diff --git a/doc/stdlibref/limits-h.html b/doc/stdlibref/limits-h.html
index 70ea269..e1b5b1b 100644
--- a/doc/stdlibref/limits-h.html
+++ b/doc/stdlibref/limits-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;limits&gt;</TITLE>
diff --git a/doc/stdlibref/list-h.html b/doc/stdlibref/list-h.html
index 4243b05..2bec8ee 100644
--- a/doc/stdlibref/list-h.html
+++ b/doc/stdlibref/list-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;list&gt;</TITLE>
diff --git a/doc/stdlibref/list.html b/doc/stdlibref/list.html
index b161bde..15fefcc 100644
--- a/doc/stdlibref/list.html
+++ b/doc/stdlibref/list.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>list</TITLE>
diff --git a/doc/stdlibref/lists.html b/doc/stdlibref/lists.html
index 05c77a7..4b20c2b 100644
--- a/doc/stdlibref/lists.html
+++ b/doc/stdlibref/lists.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Table, Figure, and Examples List</TITLE>
diff --git a/doc/stdlibref/locale-h.html b/doc/stdlibref/locale-h.html
index 3b86715..edb8eef 100644
--- a/doc/stdlibref/locale-h.html
+++ b/doc/stdlibref/locale-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;locale&gt;</TITLE>
diff --git a/doc/stdlibref/locale.html b/doc/stdlibref/locale.html
index e6dd240..b43041a 100644
--- a/doc/stdlibref/locale.html
+++ b/doc/stdlibref/locale.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>locale</TITLE>
diff --git a/doc/stdlibref/localedefutility.html b/doc/stdlibref/localedefutility.html
index d3f9a67..86ff1d7 100644
--- a/doc/stdlibref/localedefutility.html
+++ b/doc/stdlibref/localedefutility.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>localedef utility</TITLE>
diff --git a/doc/stdlibref/localeutility.html b/doc/stdlibref/localeutility.html
index 8625086..a45118d 100644
--- a/doc/stdlibref/localeutility.html
+++ b/doc/stdlibref/localeutility.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>locale utility</TITLE>
diff --git a/doc/stdlibref/logic-error.html b/doc/stdlibref/logic-error.html
index 88fc036..8114be8 100644
--- a/doc/stdlibref/logic-error.html
+++ b/doc/stdlibref/logic-error.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>logic_error</TITLE>
diff --git a/doc/stdlibref/logical-and.html b/doc/stdlibref/logical-and.html
index 9464bcf..cfe815a 100644
--- a/doc/stdlibref/logical-and.html
+++ b/doc/stdlibref/logical-and.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>logical_and</TITLE>
diff --git a/doc/stdlibref/logical-not.html b/doc/stdlibref/logical-not.html
index 9b39abe..de1b48f 100644
--- a/doc/stdlibref/logical-not.html
+++ b/doc/stdlibref/logical-not.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>logical_not</TITLE>
diff --git a/doc/stdlibref/logical-or.html b/doc/stdlibref/logical-or.html
index ed7f3d6..8f5912c 100644
--- a/doc/stdlibref/logical-or.html
+++ b/doc/stdlibref/logical-or.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>logical_or</TITLE>
diff --git a/doc/stdlibref/lower-bound.html b/doc/stdlibref/lower-bound.html
index c99a501..14854b2 100644
--- a/doc/stdlibref/lower-bound.html
+++ b/doc/stdlibref/lower-bound.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>lower_bound()</TITLE>
diff --git a/doc/stdlibref/make-heap.html b/doc/stdlibref/make-heap.html
index 51ed7e7..4279add 100644
--- a/doc/stdlibref/make-heap.html
+++ b/doc/stdlibref/make-heap.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>make_heap()</TITLE>
diff --git a/doc/stdlibref/map-h.html b/doc/stdlibref/map-h.html
index 9d5de29..c27573e 100644
--- a/doc/stdlibref/map-h.html
+++ b/doc/stdlibref/map-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;map&gt;</TITLE>
diff --git a/doc/stdlibref/map.html b/doc/stdlibref/map.html
index 07a0e36..c93caab 100644
--- a/doc/stdlibref/map.html
+++ b/doc/stdlibref/map.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>map</TITLE>
diff --git a/doc/stdlibref/mask-array.html b/doc/stdlibref/mask-array.html
index db2b203..3a3e420 100644
--- a/doc/stdlibref/mask-array.html
+++ b/doc/stdlibref/mask-array.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>mask_array</TITLE>
diff --git a/doc/stdlibref/max-element.html b/doc/stdlibref/max-element.html
index ed47fc6..b342b8f 100644
--- a/doc/stdlibref/max-element.html
+++ b/doc/stdlibref/max-element.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>max_element()</TITLE>
diff --git a/doc/stdlibref/max.html b/doc/stdlibref/max.html
index 952c7ea..6af585d 100644
--- a/doc/stdlibref/max.html
+++ b/doc/stdlibref/max.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>max()</TITLE>
diff --git a/doc/stdlibref/mem-fun.html b/doc/stdlibref/mem-fun.html
index 36a3999..f8f3b49 100644
--- a/doc/stdlibref/mem-fun.html
+++ b/doc/stdlibref/mem-fun.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>mem_fun, mem_fun_ref</TITLE>
diff --git a/doc/stdlibref/memory-h.html b/doc/stdlibref/memory-h.html
index 6bc20e4..add7f33 100644
--- a/doc/stdlibref/memory-h.html
+++ b/doc/stdlibref/memory-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;memory&gt;</TITLE>
diff --git a/doc/stdlibref/merge.html b/doc/stdlibref/merge.html
index da66f09..0407b18 100644
--- a/doc/stdlibref/merge.html
+++ b/doc/stdlibref/merge.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>merge()</TITLE>
diff --git a/doc/stdlibref/messages.html b/doc/stdlibref/messages.html
index ee0db82..a0fa93f 100644
--- a/doc/stdlibref/messages.html
+++ b/doc/stdlibref/messages.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>messages, messages_byname</TITLE>
diff --git a/doc/stdlibref/min-element.html b/doc/stdlibref/min-element.html
index 43cce48..97079e6 100644
--- a/doc/stdlibref/min-element.html
+++ b/doc/stdlibref/min-element.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>min_element()</TITLE>
diff --git a/doc/stdlibref/min.html b/doc/stdlibref/min.html
index 5ffb6ec..27054d1 100644
--- a/doc/stdlibref/min.html
+++ b/doc/stdlibref/min.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>min()</TITLE>
diff --git a/doc/stdlibref/minus.html b/doc/stdlibref/minus.html
index 091efbc..3168faa 100644
--- a/doc/stdlibref/minus.html
+++ b/doc/stdlibref/minus.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>minus</TITLE>
diff --git a/doc/stdlibref/mismatch.html b/doc/stdlibref/mismatch.html
index 4c6283e..f49e11d 100644
--- a/doc/stdlibref/mismatch.html
+++ b/doc/stdlibref/mismatch.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>mismatch()</TITLE>
diff --git a/doc/stdlibref/modulus.html b/doc/stdlibref/modulus.html
index 2147a12..22e9e63 100644
--- a/doc/stdlibref/modulus.html
+++ b/doc/stdlibref/modulus.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>modulus</TITLE>
diff --git a/doc/stdlibref/money-get.html b/doc/stdlibref/money-get.html
index cdff5a4..d1683ef 100644
--- a/doc/stdlibref/money-get.html
+++ b/doc/stdlibref/money-get.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>money_get</TITLE>
@@ -220,7 +240,11 @@
 
 <BR>
 <HR>
+
 <A HREF="modulus.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="moneypunct.html"><IMG SRC="images/bnext.gif" WIDTH=20 HEIGHT=21 ALT="Next file" BORDER=O></A>
+<font color="#525D76" size="-1"><em>
+Copyright &#169; 2003-2006, The Apache Software Foundation
+</em></font>
 
 <!-- Google Analytics tracking code -->
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
diff --git a/doc/stdlibref/money-put.html b/doc/stdlibref/money-put.html
index bf0b93b..7ef79f3 100644
--- a/doc/stdlibref/money-put.html
+++ b/doc/stdlibref/money-put.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>money_put</TITLE>
@@ -166,8 +186,7 @@
 
 int main ()
 {
-    typedef std::ostreambuf_iterator&lt;char,
-        std::char_traits&lt;char&gt; &gt; Iter;
+    typedef std::ostreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; Iter;
   
     const std::string buffer ("10002");
     const long double ldval = 10002; 
@@ -175,10 +194,11 @@
     // Construct a ostreambuf_iterator on cout
     Iter begin (std::cout);
 
+    const std::locale loc;
+
     // Get a money put facet
-    const std::money_put&lt;char, Iter&gt; &amp;mp =
-        std::use_facet&lt;std::money_put&lt;char, Iter&gt; &gt;(std::locale
-        ());
+    const std::money_put&lt;char, Iter&gt; &amp;mp = 
+        std::use_facet&lt;std::money_put&lt;char, Iter&gt; &gt;(loc);
 
     // Put out the string representation of the monetary value
     std::cout &lt;&lt; buffer &lt;&lt; " --&gt; ";
diff --git a/doc/stdlibref/moneypunct.html b/doc/stdlibref/moneypunct.html
index 0a1926e..881d7b2 100644
--- a/doc/stdlibref/moneypunct.html
+++ b/doc/stdlibref/moneypunct.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>moneypunct, moneypunct_byname</TITLE>
diff --git a/doc/stdlibref/multimap.html b/doc/stdlibref/multimap.html
index df4076f..c8bbd52 100644
--- a/doc/stdlibref/multimap.html
+++ b/doc/stdlibref/multimap.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>multimap</TITLE>
diff --git a/doc/stdlibref/multiplies.html b/doc/stdlibref/multiplies.html
index 987b6d6..d483d48 100644
--- a/doc/stdlibref/multiplies.html
+++ b/doc/stdlibref/multiplies.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>multiplies</TITLE>
diff --git a/doc/stdlibref/multiset.html b/doc/stdlibref/multiset.html
index a7aa95a..10286ad 100644
--- a/doc/stdlibref/multiset.html
+++ b/doc/stdlibref/multiset.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>multiset</TITLE>
diff --git a/doc/stdlibref/negate.html b/doc/stdlibref/negate.html
index bf054fd..279b001 100644
--- a/doc/stdlibref/negate.html
+++ b/doc/stdlibref/negate.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>negate</TITLE>
diff --git a/doc/stdlibref/negators.html b/doc/stdlibref/negators.html
index c2f259e..a913dc2 100644
--- a/doc/stdlibref/negators.html
+++ b/doc/stdlibref/negators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Negators</TITLE>
diff --git a/doc/stdlibref/new-h.html b/doc/stdlibref/new-h.html
index 666168f..468822e 100644
--- a/doc/stdlibref/new-h.html
+++ b/doc/stdlibref/new-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;new&gt;</TITLE>
diff --git a/doc/stdlibref/next-permutation.html b/doc/stdlibref/next-permutation.html
index 37fdeee..995bf3a 100644
--- a/doc/stdlibref/next-permutation.html
+++ b/doc/stdlibref/next-permutation.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>next_permutation()</TITLE>
diff --git a/doc/stdlibref/noframes.html b/doc/stdlibref/noframes.html
index 4394589..d12a913 100644
--- a/doc/stdlibref/noframes.html
+++ b/doc/stdlibref/noframes.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>C++ Standard Library Module Reference Guide</TITLE>
diff --git a/doc/stdlibref/not-equal-to.html b/doc/stdlibref/not-equal-to.html
index 74a6e3d..d943ec2 100644
--- a/doc/stdlibref/not-equal-to.html
+++ b/doc/stdlibref/not-equal-to.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>not_equal_to</TITLE>
diff --git a/doc/stdlibref/not1.html b/doc/stdlibref/not1.html
index 0fd4404..62355ce 100644
--- a/doc/stdlibref/not1.html
+++ b/doc/stdlibref/not1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>not1()</TITLE>
diff --git a/doc/stdlibref/not2.html b/doc/stdlibref/not2.html
index 0c87ca6..4553e7b 100644
--- a/doc/stdlibref/not2.html
+++ b/doc/stdlibref/not2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>not2()</TITLE>
diff --git a/doc/stdlibref/nth-element.html b/doc/stdlibref/nth-element.html
index 4f2ba82..c16ba8d 100644
--- a/doc/stdlibref/nth-element.html
+++ b/doc/stdlibref/nth-element.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>nth_element()</TITLE>
diff --git a/doc/stdlibref/num-get.html b/doc/stdlibref/num-get.html
index c0cb1c9..603f821 100644
--- a/doc/stdlibref/num-get.html
+++ b/doc/stdlibref/num-get.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>num_get</TITLE>
@@ -243,9 +263,11 @@
     long        lval  = 0L;
     long double ldval = 0.0;
 
+    const std::locale loc;
+
     // Get a num_get facet
     const std::num_get&lt;char, Iter&gt; &amp;ng =
-        std::use_facet&lt;std::num_get&lt;char, Iter&gt; &gt;(std::locale ());
+        std::use_facet&lt;std::num_get&lt;char, Iter&gt; &gt;(loc);
 
 #ifndef _RWSTD_NO_BOOL
     {
diff --git a/doc/stdlibref/num-put.html b/doc/stdlibref/num-put.html
index b2c76e8..84e9e56 100644
--- a/doc/stdlibref/num-put.html
+++ b/doc/stdlibref/num-put.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>num_put</TITLE>
diff --git a/doc/stdlibref/numeric-h.html b/doc/stdlibref/numeric-h.html
index 6f886af..3a70380 100644
--- a/doc/stdlibref/numeric-h.html
+++ b/doc/stdlibref/numeric-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;numeric&gt;</TITLE>
diff --git a/doc/stdlibref/numeric-limits.html b/doc/stdlibref/numeric-limits.html
index 2652c4f..3584805 100644
--- a/doc/stdlibref/numeric-limits.html
+++ b/doc/stdlibref/numeric-limits.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>numeric_limits</TITLE>
diff --git a/doc/stdlibref/numpunct.html b/doc/stdlibref/numpunct.html
index bd0f2ae..f9f53f5 100644
--- a/doc/stdlibref/numpunct.html
+++ b/doc/stdlibref/numpunct.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>numpunct, numpunct_byname</TITLE>
diff --git a/doc/stdlibref/operatordelete.html b/doc/stdlibref/operatordelete.html
index 4f78441..131f48b 100644
--- a/doc/stdlibref/operatordelete.html
+++ b/doc/stdlibref/operatordelete.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>operator delete</TITLE>
diff --git a/doc/stdlibref/operatornew.html b/doc/stdlibref/operatornew.html
index 16c5655..e3f35c0 100644
--- a/doc/stdlibref/operatornew.html
+++ b/doc/stdlibref/operatornew.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>operator new</TITLE>
diff --git a/doc/stdlibref/operators.html b/doc/stdlibref/operators.html
index 76d8c49..7a8580b 100644
--- a/doc/stdlibref/operators.html
+++ b/doc/stdlibref/operators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Operators</TITLE>
diff --git a/doc/stdlibref/ostream-h.html b/doc/stdlibref/ostream-h.html
index 749a451..cc436e2 100644
--- a/doc/stdlibref/ostream-h.html
+++ b/doc/stdlibref/ostream-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;ostream&gt;</TITLE>
diff --git a/doc/stdlibref/ostream-iterator.html b/doc/stdlibref/ostream-iterator.html
index 306bb02..7661a90 100644
--- a/doc/stdlibref/ostream-iterator.html
+++ b/doc/stdlibref/ostream-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ostream_iterator</TITLE>
diff --git a/doc/stdlibref/ostreambuf-iterator.html b/doc/stdlibref/ostreambuf-iterator.html
index d8b8498..7157e59 100644
--- a/doc/stdlibref/ostreambuf-iterator.html
+++ b/doc/stdlibref/ostreambuf-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ostreambuf_iterator</TITLE>
diff --git a/doc/stdlibref/ostrstream.html b/doc/stdlibref/ostrstream.html
index 47afd09..8f8c10f 100644
--- a/doc/stdlibref/ostrstream.html
+++ b/doc/stdlibref/ostrstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ostrstream</TITLE>
diff --git a/doc/stdlibref/out-of-range.html b/doc/stdlibref/out-of-range.html
index 3b55292..fa9d6a8 100644
--- a/doc/stdlibref/out-of-range.html
+++ b/doc/stdlibref/out-of-range.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>out_of_range</TITLE>
diff --git a/doc/stdlibref/outputiterators.html b/doc/stdlibref/outputiterators.html
index e9919b3..f884e9e 100644
--- a/doc/stdlibref/outputiterators.html
+++ b/doc/stdlibref/outputiterators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Output Iterators</TITLE>
diff --git a/doc/stdlibref/overflow-error.html b/doc/stdlibref/overflow-error.html
index 7c5ad30..5ec5db7 100644
--- a/doc/stdlibref/overflow-error.html
+++ b/doc/stdlibref/overflow-error.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>overflow_error</TITLE>
diff --git a/doc/stdlibref/pair.html b/doc/stdlibref/pair.html
index 90acc95..625886a 100644
--- a/doc/stdlibref/pair.html
+++ b/doc/stdlibref/pair.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>pair</TITLE>
diff --git a/doc/stdlibref/partial-sort-copy.html b/doc/stdlibref/partial-sort-copy.html
index 6f4b31f..1314a83 100644
--- a/doc/stdlibref/partial-sort-copy.html
+++ b/doc/stdlibref/partial-sort-copy.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>partial_sort_copy()</TITLE>
diff --git a/doc/stdlibref/partial-sort.html b/doc/stdlibref/partial-sort.html
index 3c424a6..69c251a 100644
--- a/doc/stdlibref/partial-sort.html
+++ b/doc/stdlibref/partial-sort.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>partial_sort()</TITLE>
diff --git a/doc/stdlibref/partial-sum.html b/doc/stdlibref/partial-sum.html
index ba71fc8..1505d55 100644
--- a/doc/stdlibref/partial-sum.html
+++ b/doc/stdlibref/partial-sum.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>partial_sum()</TITLE>
diff --git a/doc/stdlibref/partition.html b/doc/stdlibref/partition.html
index a13a1f9..87f15d7 100644
--- a/doc/stdlibref/partition.html
+++ b/doc/stdlibref/partition.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>partition()</TITLE>
diff --git a/doc/stdlibref/plus.html b/doc/stdlibref/plus.html
index b83c6c4..3bab495 100644
--- a/doc/stdlibref/plus.html
+++ b/doc/stdlibref/plus.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>plus</TITLE>
diff --git a/doc/stdlibref/pointer-to-binary-function.html b/doc/stdlibref/pointer-to-binary-function.html
index 166a87f..64b8f9c 100644
--- a/doc/stdlibref/pointer-to-binary-function.html
+++ b/doc/stdlibref/pointer-to-binary-function.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>pointer_to_binary_function</TITLE>
diff --git a/doc/stdlibref/pointer-to-unary-function.html b/doc/stdlibref/pointer-to-unary-function.html
index ab21564..d71706a 100644
--- a/doc/stdlibref/pointer-to-unary-function.html
+++ b/doc/stdlibref/pointer-to-unary-function.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>pointer_to_unary_function</TITLE>
diff --git a/doc/stdlibref/pop-heap.html b/doc/stdlibref/pop-heap.html
index 56662ca..59af6de 100644
--- a/doc/stdlibref/pop-heap.html
+++ b/doc/stdlibref/pop-heap.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>pop_heap()</TITLE>
diff --git a/doc/stdlibref/predicates.html b/doc/stdlibref/predicates.html
index 059233c..becf921 100644
--- a/doc/stdlibref/predicates.html
+++ b/doc/stdlibref/predicates.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Predicates</TITLE>
diff --git a/doc/stdlibref/prev-permutation.html b/doc/stdlibref/prev-permutation.html
index 2e9427f..f69fecd 100644
--- a/doc/stdlibref/prev-permutation.html
+++ b/doc/stdlibref/prev-permutation.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>prev_permutation()</TITLE>
diff --git a/doc/stdlibref/priority-queue.html b/doc/stdlibref/priority-queue.html
index c8f0dce..ecfcc30 100644
--- a/doc/stdlibref/priority-queue.html
+++ b/doc/stdlibref/priority-queue.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>priority_queue</TITLE>
diff --git a/doc/stdlibref/ptr-fun.html b/doc/stdlibref/ptr-fun.html
index 9617883..bd3ae93 100644
--- a/doc/stdlibref/ptr-fun.html
+++ b/doc/stdlibref/ptr-fun.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>ptr_fun()</TITLE>
diff --git a/doc/stdlibref/push-heap.html b/doc/stdlibref/push-heap.html
index db4b47c..3716817 100644
--- a/doc/stdlibref/push-heap.html
+++ b/doc/stdlibref/push-heap.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>push_heap()</TITLE>
diff --git a/doc/stdlibref/queue-h.html b/doc/stdlibref/queue-h.html
index 3b40f3a..84424c4 100644
--- a/doc/stdlibref/queue-h.html
+++ b/doc/stdlibref/queue-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;queue&gt;</TITLE>
diff --git a/doc/stdlibref/queue.html b/doc/stdlibref/queue.html
index 6823fa2..2ecf108 100644
--- a/doc/stdlibref/queue.html
+++ b/doc/stdlibref/queue.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>queue</TITLE>
diff --git a/doc/stdlibref/random-shuffle.html b/doc/stdlibref/random-shuffle.html
index e84dee0..f7e03f5 100644
--- a/doc/stdlibref/random-shuffle.html
+++ b/doc/stdlibref/random-shuffle.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>random_shuffle()</TITLE>
diff --git a/doc/stdlibref/randomaccessiterators.html b/doc/stdlibref/randomaccessiterators.html
index 1cc038a..966a066 100644
--- a/doc/stdlibref/randomaccessiterators.html
+++ b/doc/stdlibref/randomaccessiterators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Random Access Iterators</TITLE>
diff --git a/doc/stdlibref/range-error.html b/doc/stdlibref/range-error.html
index fb95262..cc74c2b 100644
--- a/doc/stdlibref/range-error.html
+++ b/doc/stdlibref/range-error.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>range_error</TITLE>
diff --git a/doc/stdlibref/raw-storage-iterator.html b/doc/stdlibref/raw-storage-iterator.html
index 2e0a271..60760f4 100644
--- a/doc/stdlibref/raw-storage-iterator.html
+++ b/doc/stdlibref/raw-storage-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>raw_storage_iterator</TITLE>
diff --git a/doc/stdlibref/remove-copy-if.html b/doc/stdlibref/remove-copy-if.html
index 2d660de..4ede2f6 100644
--- a/doc/stdlibref/remove-copy-if.html
+++ b/doc/stdlibref/remove-copy-if.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>remove_copy_if()</TITLE>
diff --git a/doc/stdlibref/remove-copy.html b/doc/stdlibref/remove-copy.html
index a91b97b..9fa94dd 100644
--- a/doc/stdlibref/remove-copy.html
+++ b/doc/stdlibref/remove-copy.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>remove_copy()</TITLE>
diff --git a/doc/stdlibref/remove-if.html b/doc/stdlibref/remove-if.html
index 11cb7bf..8e422c1 100644
--- a/doc/stdlibref/remove-if.html
+++ b/doc/stdlibref/remove-if.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>remove_if()</TITLE>
diff --git a/doc/stdlibref/remove.html b/doc/stdlibref/remove.html
index 7ebf80f..dcc8008 100644
--- a/doc/stdlibref/remove.html
+++ b/doc/stdlibref/remove.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>remove()</TITLE>
diff --git a/doc/stdlibref/replace-copy-if.html b/doc/stdlibref/replace-copy-if.html
index a60aad9..27d02cb 100644
--- a/doc/stdlibref/replace-copy-if.html
+++ b/doc/stdlibref/replace-copy-if.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>replace_copy_if()</TITLE>
diff --git a/doc/stdlibref/replace-copy.html b/doc/stdlibref/replace-copy.html
index dead03f..01dcf8f 100644
--- a/doc/stdlibref/replace-copy.html
+++ b/doc/stdlibref/replace-copy.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>replace_copy()</TITLE>
diff --git a/doc/stdlibref/replace-if.html b/doc/stdlibref/replace-if.html
index 7685d92..2f487f4 100644
--- a/doc/stdlibref/replace-if.html
+++ b/doc/stdlibref/replace-if.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>replace_if()</TITLE>
diff --git a/doc/stdlibref/replace.html b/doc/stdlibref/replace.html
index bc82f47..2c45a9f 100644
--- a/doc/stdlibref/replace.html
+++ b/doc/stdlibref/replace.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>replace()</TITLE>
diff --git a/doc/stdlibref/return-temporary-buffer.html b/doc/stdlibref/return-temporary-buffer.html
index 9719ae0..bf76544 100644
--- a/doc/stdlibref/return-temporary-buffer.html
+++ b/doc/stdlibref/return-temporary-buffer.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>return_temporary_buffer()</TITLE>
diff --git a/doc/stdlibref/reverse-copy.html b/doc/stdlibref/reverse-copy.html
index 75b03cc..accc479 100644
--- a/doc/stdlibref/reverse-copy.html
+++ b/doc/stdlibref/reverse-copy.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>reverse_copy()</TITLE>
diff --git a/doc/stdlibref/reverse-iterator.html b/doc/stdlibref/reverse-iterator.html
index 1f3aa03..254a005 100644
--- a/doc/stdlibref/reverse-iterator.html
+++ b/doc/stdlibref/reverse-iterator.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>reverse_iterator</TITLE>
diff --git a/doc/stdlibref/reverse.html b/doc/stdlibref/reverse.html
index 25c5f5f..a1c1bcd 100644
--- a/doc/stdlibref/reverse.html
+++ b/doc/stdlibref/reverse.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>reverse()</TITLE>
diff --git a/doc/stdlibref/rotate.html b/doc/stdlibref/rotate.html
index f2b3f51..8c5be5f 100644
--- a/doc/stdlibref/rotate.html
+++ b/doc/stdlibref/rotate.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>rotate(), rotate_copy()</TITLE>
diff --git a/doc/stdlibref/runtime-error.html b/doc/stdlibref/runtime-error.html
index ada8741..fa47338 100644
--- a/doc/stdlibref/runtime-error.html
+++ b/doc/stdlibref/runtime-error.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>runtime_error</TITLE>
diff --git a/doc/stdlibref/search.html b/doc/stdlibref/search.html
index 51486a8..06db0f2 100644
--- a/doc/stdlibref/search.html
+++ b/doc/stdlibref/search.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>search(), search_n()</TITLE>
diff --git a/doc/stdlibref/sequences.html b/doc/stdlibref/sequences.html
index 59245ff..f840b16 100644
--- a/doc/stdlibref/sequences.html
+++ b/doc/stdlibref/sequences.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Sequences</TITLE>
diff --git a/doc/stdlibref/set-difference.html b/doc/stdlibref/set-difference.html
index 856bfe4..dc44adb 100644
--- a/doc/stdlibref/set-difference.html
+++ b/doc/stdlibref/set-difference.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set_difference()</TITLE>
diff --git a/doc/stdlibref/set-h.html b/doc/stdlibref/set-h.html
index 992c162..32798e8 100644
--- a/doc/stdlibref/set-h.html
+++ b/doc/stdlibref/set-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;set&gt;</TITLE>
diff --git a/doc/stdlibref/set-intersection.html b/doc/stdlibref/set-intersection.html
index ffb264c..393ed1c 100644
--- a/doc/stdlibref/set-intersection.html
+++ b/doc/stdlibref/set-intersection.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set_intersection()</TITLE>
diff --git a/doc/stdlibref/set-symmetric-difference.html b/doc/stdlibref/set-symmetric-difference.html
index f2284a0..30a4a7f 100644
--- a/doc/stdlibref/set-symmetric-difference.html
+++ b/doc/stdlibref/set-symmetric-difference.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set_symmetric_difference()</TITLE>
diff --git a/doc/stdlibref/set-union.html b/doc/stdlibref/set-union.html
index 03edf8f..ad3df72 100644
--- a/doc/stdlibref/set-union.html
+++ b/doc/stdlibref/set-union.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set_union()</TITLE>
diff --git a/doc/stdlibref/set.html b/doc/stdlibref/set.html
index d859ca6..2192d17 100644
--- a/doc/stdlibref/set.html
+++ b/doc/stdlibref/set.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set</TITLE>
diff --git a/doc/stdlibref/slice-array.html b/doc/stdlibref/slice-array.html
index 54b6203..d971ee0 100644
--- a/doc/stdlibref/slice-array.html
+++ b/doc/stdlibref/slice-array.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>slice_array</TITLE>
diff --git a/doc/stdlibref/slice.html b/doc/stdlibref/slice.html
index 309da57..0c88535 100644
--- a/doc/stdlibref/slice.html
+++ b/doc/stdlibref/slice.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>slice</TITLE>
diff --git a/doc/stdlibref/sort-heap.html b/doc/stdlibref/sort-heap.html
index 26afa1e..3888d5d 100644
--- a/doc/stdlibref/sort-heap.html
+++ b/doc/stdlibref/sort-heap.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>sort_heap()</TITLE>
diff --git a/doc/stdlibref/sort.html b/doc/stdlibref/sort.html
index 88e3e22..6b02222 100644
--- a/doc/stdlibref/sort.html
+++ b/doc/stdlibref/sort.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>sort()</TITLE>
diff --git a/doc/stdlibref/sstream-h.html b/doc/stdlibref/sstream-h.html
index b340065..882d694 100644
--- a/doc/stdlibref/sstream-h.html
+++ b/doc/stdlibref/sstream-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;sstream&gt;</TITLE>
diff --git a/doc/stdlibref/stable-partition.html b/doc/stdlibref/stable-partition.html
index 35f2bca..831a287 100644
--- a/doc/stdlibref/stable-partition.html
+++ b/doc/stdlibref/stable-partition.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>stable_partition()</TITLE>
diff --git a/doc/stdlibref/stable-sort.html b/doc/stdlibref/stable-sort.html
index 9ebaf29..711b71b 100644
--- a/doc/stdlibref/stable-sort.html
+++ b/doc/stdlibref/stable-sort.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>stable_sort()</TITLE>
diff --git a/doc/stdlibref/stack-h.html b/doc/stdlibref/stack-h.html
index 4fb05a6..c817104 100644
--- a/doc/stdlibref/stack-h.html
+++ b/doc/stdlibref/stack-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;stack&gt;</TITLE>
diff --git a/doc/stdlibref/stack.html b/doc/stdlibref/stack.html
index 9b9dc5e..8ccec0a 100644
--- a/doc/stdlibref/stack.html
+++ b/doc/stdlibref/stack.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>stack</TITLE>
diff --git a/doc/stdlibref/stdexcept-h.html b/doc/stdlibref/stdexcept-h.html
index 3dc9b4e..173e4c0 100644
--- a/doc/stdlibref/stdexcept-h.html
+++ b/doc/stdlibref/stdexcept-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;stdexcept&gt;</TITLE>
diff --git a/doc/stdlibref/streambuf-h.html b/doc/stdlibref/streambuf-h.html
index 35a87c5..39b81da 100644
--- a/doc/stdlibref/streambuf-h.html
+++ b/doc/stdlibref/streambuf-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;streambuf&gt;</TITLE>
diff --git a/doc/stdlibref/streamiterators.html b/doc/stdlibref/streamiterators.html
index 59f133d..753b2f6 100644
--- a/doc/stdlibref/streamiterators.html
+++ b/doc/stdlibref/streamiterators.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Stream Iterators</TITLE>
diff --git a/doc/stdlibref/string-h.html b/doc/stdlibref/string-h.html
index 4079af9..6debc4b 100644
--- a/doc/stdlibref/string-h.html
+++ b/doc/stdlibref/string-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;string&gt;</TITLE>
diff --git a/doc/stdlibref/string.html b/doc/stdlibref/string.html
index 905fc03..c5acca2 100644
--- a/doc/stdlibref/string.html
+++ b/doc/stdlibref/string.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>string</TITLE>
diff --git a/doc/stdlibref/strstream-h.html b/doc/stdlibref/strstream-h.html
index b1b65c8..9c497b2 100644
--- a/doc/stdlibref/strstream-h.html
+++ b/doc/stdlibref/strstream-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;strstream&gt;</TITLE>
diff --git a/doc/stdlibref/strstream.html b/doc/stdlibref/strstream.html
index d31a0a1..517f8d5 100644
--- a/doc/stdlibref/strstream.html
+++ b/doc/stdlibref/strstream.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>strstream</TITLE>
diff --git a/doc/stdlibref/strstreambuf.html b/doc/stdlibref/strstreambuf.html
index 91cc92a..9bf6580 100644
--- a/doc/stdlibref/strstreambuf.html
+++ b/doc/stdlibref/strstreambuf.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>strstreambuf</TITLE>
diff --git a/doc/stdlibref/swap-ranges.html b/doc/stdlibref/swap-ranges.html
index 3ca2e94..c3b0186 100644
--- a/doc/stdlibref/swap-ranges.html
+++ b/doc/stdlibref/swap-ranges.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>swap_ranges()</TITLE>
diff --git a/doc/stdlibref/swap.html b/doc/stdlibref/swap.html
index 5ea15b9..1df1237 100644
--- a/doc/stdlibref/swap.html
+++ b/doc/stdlibref/swap.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>swap()</TITLE>
diff --git a/doc/stdlibref/time-get-byname.html b/doc/stdlibref/time-get-byname.html
index 1ce03c0..8346b8d 100644
--- a/doc/stdlibref/time-get-byname.html
+++ b/doc/stdlibref/time-get-byname.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>time_get_byname</TITLE>
diff --git a/doc/stdlibref/time-get.html b/doc/stdlibref/time-get.html
index 8b67e12..ba511cb 100644
--- a/doc/stdlibref/time-get.html
+++ b/doc/stdlibref/time-get.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>time_get</TITLE>
@@ -572,29 +592,41 @@
 #include &lt;sstream&gt;    // for stringstream
 #include &lt;iostream&gt;   // for cout, endl
 
-// Print out a tm struct
-std::ostream&amp; operator&lt;&lt; (std::ostream &amp;os, const struct tm &amp;t)
+
+// Print out a tm struct value in one atomic operation
+std::ostream&amp; operator&lt;&lt; (std::ostream &amp;os, const std::tm &amp;t)
 {
-    return os &lt;&lt; "Daylight Savings = " &lt;&lt; t.tm_isdst
-              &lt;&lt; "\nDay of year      = " &lt;&lt; t.tm_yday
-              &lt;&lt; "\nDay of week      = " &lt;&lt; t.tm_wday
-              &lt;&lt; "\nYear             = " &lt;&lt; t.tm_year
-              &lt;&lt; "\nMonth            = " &lt;&lt; t.tm_mon
-              &lt;&lt; "\nDay of month     = " &lt;&lt; t.tm_mday
-              &lt;&lt; "\nHour             = " &lt;&lt; t.tm_hour
-              &lt;&lt; "\nMinute           = " &lt;&lt; t.tm_min
-              &lt;&lt; "\nSecond           = " &lt;&lt; t.tm_sec
-              &lt;&lt; std::endl;
+    std::stringstream strm;
+
+    strm &lt;&lt; "Daylight Savings = "   &lt;&lt; t.tm_isdst
+         &lt;&lt; "\nDay of year      = " &lt;&lt; t.tm_yday
+         &lt;&lt; "\nDay of week      = " &lt;&lt; t.tm_wday
+         &lt;&lt; "\nYear             = " &lt;&lt; t.tm_year
+         &lt;&lt; "\nMonth            = " &lt;&lt; t.tm_mon
+         &lt;&lt; "\nDay of month     = " &lt;&lt; t.tm_mday
+         &lt;&lt; "\nHour             = " &lt;&lt; t.tm_hour
+         &lt;&lt; "\nMinute           = " &lt;&lt; t.tm_min
+         &lt;&lt; "\nSecond           = " &lt;&lt; t.tm_sec
+         &lt;&lt; '\n';
+
+    // guard for thread safety and output synchronization
+    const std::ostream::sentry guard (os);
+
+    if (guard)
+        os.rdbuf ()-&gt;sputn (strm.str ().c_str (), strm.str ().size ());
+    else
+        os.setstate (os.failbit);
+
+    return os;
 }
 
 
 int main ()
 {
-    typedef std::istreambuf_iterator&lt;char,
-            std::char_traits&lt;char&gt; &gt; Iter;
+    typedef std::istreambuf_iterator&lt;char, std::char_traits&lt;char&gt; &gt; Iter;
 
     // time struct to parse date into
-    static struct tm timeb;  // zero initialized
+    static std::tm timeb;  // zero initialized
 
     // Unused, required by time_get
     std::ios_base::iostate state;
@@ -606,14 +638,14 @@
     Iter begin (ins);
     Iter end;
 
+    const std::locale loc ("C");
+
     // Get a reference to the time_get facet in locale loc.
     const std::time_get&lt;char, Iter&gt; &amp;tg =
-        std::use_facet&lt;std::time_get&lt;char, Iter&gt; &gt;(std::locale
-                 ("C"));
+        std::use_facet&lt;std::time_get&lt;char, Iter&gt; &gt;(loc);
 
     // Display time_base::dateorder value.
-    std::cout &lt;&lt; "time_base::dateorder == " &lt;&lt; tg.date_order ()
-                 &lt;&lt; ".\n";
+    std::cout &lt;&lt; "time_base::dateorder == " &lt;&lt; tg.date_order () &lt;&lt; ".\n";
   
     // Insert date string into stream.
     ins.str ("04/07/69");
diff --git a/doc/stdlibref/time-put-byname.html b/doc/stdlibref/time-put-byname.html
index c6a66ce..2ccd8aa 100644
--- a/doc/stdlibref/time-put-byname.html
+++ b/doc/stdlibref/time-put-byname.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>time_put_byname</TITLE>
diff --git a/doc/stdlibref/time-put.html b/doc/stdlibref/time-put.html
index 85d2c4e..37d3dd3 100644
--- a/doc/stdlibref/time-put.html
+++ b/doc/stdlibref/time-put.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>time_put</TITLE>
diff --git a/doc/stdlibref/tindex.html b/doc/stdlibref/tindex.html
index d50c7d9..9ddd72e 100644
--- a/doc/stdlibref/tindex.html
+++ b/doc/stdlibref/tindex.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Function and Datatype Index</TITLE>
diff --git a/doc/stdlibref/tolower.html b/doc/stdlibref/tolower.html
index 456809c..7e4fed8 100644
--- a/doc/stdlibref/tolower.html
+++ b/doc/stdlibref/tolower.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>tolower()</TITLE>
diff --git a/doc/stdlibref/toupper.html b/doc/stdlibref/toupper.html
index bf5a8ea..1e0f04b 100644
--- a/doc/stdlibref/toupper.html
+++ b/doc/stdlibref/toupper.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>toupper()</TITLE>
diff --git a/doc/stdlibref/transform.html b/doc/stdlibref/transform.html
index 6826bd9..cdf6614 100644
--- a/doc/stdlibref/transform.html
+++ b/doc/stdlibref/transform.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>transform()</TITLE>
diff --git a/doc/stdlibref/typeinfo-h.html b/doc/stdlibref/typeinfo-h.html
index 3961cba..0771184 100644
--- a/doc/stdlibref/typeinfo-h.html
+++ b/doc/stdlibref/typeinfo-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;typeinfo&gt;</TITLE>
diff --git a/doc/stdlibref/unary-function.html b/doc/stdlibref/unary-function.html
index f542bae..106ad20 100644
--- a/doc/stdlibref/unary-function.html
+++ b/doc/stdlibref/unary-function.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>unary_function</TITLE>
diff --git a/doc/stdlibref/unary-negate.html b/doc/stdlibref/unary-negate.html
index ddeb4e6..d896673 100644
--- a/doc/stdlibref/unary-negate.html
+++ b/doc/stdlibref/unary-negate.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>unary_negate</TITLE>
diff --git a/doc/stdlibref/underflow-error.html b/doc/stdlibref/underflow-error.html
index ad0c6e5..45c220b 100644
--- a/doc/stdlibref/underflow-error.html
+++ b/doc/stdlibref/underflow-error.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>underflow_error</TITLE>
diff --git a/doc/stdlibref/uninitialized-copy.html b/doc/stdlibref/uninitialized-copy.html
index 7617c83..71ece43 100644
--- a/doc/stdlibref/uninitialized-copy.html
+++ b/doc/stdlibref/uninitialized-copy.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>uninitialized_copy()</TITLE>
diff --git a/doc/stdlibref/uninitialized-fill-n.html b/doc/stdlibref/uninitialized-fill-n.html
index 6896e00..65ae630 100644
--- a/doc/stdlibref/uninitialized-fill-n.html
+++ b/doc/stdlibref/uninitialized-fill-n.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>uninitialized_fill_n()</TITLE>
diff --git a/doc/stdlibref/uninitialized-fill.html b/doc/stdlibref/uninitialized-fill.html
index 104d316..f6fbb5c 100644
--- a/doc/stdlibref/uninitialized-fill.html
+++ b/doc/stdlibref/uninitialized-fill.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>uninitialized_fill()</TITLE>
diff --git a/doc/stdlibref/unique.html b/doc/stdlibref/unique.html
index 842e88b..4b107d1 100644
--- a/doc/stdlibref/unique.html
+++ b/doc/stdlibref/unique.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>unique(), unique_copy()</TITLE>
diff --git a/doc/stdlibref/upper-bound.html b/doc/stdlibref/upper-bound.html
index 4445608..2d02404 100644
--- a/doc/stdlibref/upper-bound.html
+++ b/doc/stdlibref/upper-bound.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>upper_bound()</TITLE>
diff --git a/doc/stdlibref/use-facet.html b/doc/stdlibref/use-facet.html
index 2dd31bb..ec0dd5f 100644
--- a/doc/stdlibref/use-facet.html
+++ b/doc/stdlibref/use-facet.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>use_facet()</TITLE>
diff --git a/doc/stdlibref/utility-h.html b/doc/stdlibref/utility-h.html
index c53ab1a..0448afe 100644
--- a/doc/stdlibref/utility-h.html
+++ b/doc/stdlibref/utility-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;utility&gt;</TITLE>
diff --git a/doc/stdlibref/valarray-h.html b/doc/stdlibref/valarray-h.html
index b01781d..a7c8a47 100644
--- a/doc/stdlibref/valarray-h.html
+++ b/doc/stdlibref/valarray-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;valarray&gt;</TITLE>
diff --git a/doc/stdlibref/valarray.html b/doc/stdlibref/valarray.html
index 55d3626..14490b1 100644
--- a/doc/stdlibref/valarray.html
+++ b/doc/stdlibref/valarray.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>valarray</TITLE>
diff --git a/doc/stdlibref/vector-h.html b/doc/stdlibref/vector-h.html
index 19a6837..06166c4 100644
--- a/doc/stdlibref/vector-h.html
+++ b/doc/stdlibref/vector-h.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>&lt;vector&gt;</TITLE>
diff --git a/doc/stdlibref/vector.html b/doc/stdlibref/vector.html
index f43e18d..c515fcc 100644
--- a/doc/stdlibref/vector.html
+++ b/doc/stdlibref/vector.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>vector</TITLE>
diff --git a/doc/stdlibref/wcerr.html b/doc/stdlibref/wcerr.html
index 9e3bff5..c61bcdc 100644
--- a/doc/stdlibref/wcerr.html
+++ b/doc/stdlibref/wcerr.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>wcerr</TITLE>
diff --git a/doc/stdlibref/wcin.html b/doc/stdlibref/wcin.html
index 091691a..9a8b84c 100644
--- a/doc/stdlibref/wcin.html
+++ b/doc/stdlibref/wcin.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>wcin</TITLE>
diff --git a/doc/stdlibref/wclog.html b/doc/stdlibref/wclog.html
index 586d5bf..29d9816 100644
--- a/doc/stdlibref/wclog.html
+++ b/doc/stdlibref/wclog.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>wclog</TITLE>
diff --git a/doc/stdlibref/wcout.html b/doc/stdlibref/wcout.html
index 208d7c0..dbed5ed 100644
--- a/doc/stdlibref/wcout.html
+++ b/doc/stdlibref/wcout.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>wcout</TITLE>
diff --git a/doc/stdlibref/wstring.html b/doc/stdlibref/wstring.html
index 1d6973e..78fe7b9 100644
--- a/doc/stdlibref/wstring.html
+++ b/doc/stdlibref/wstring.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>wstring</TITLE>
diff --git a/doc/stdlibug/1-1.html b/doc/stdlibug/1-1.html
index 0a0da68..f263dbd 100644
--- a/doc/stdlibug/1-1.html
+++ b/doc/stdlibug/1-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Welcome</TITLE>
diff --git a/doc/stdlibug/1-2.html b/doc/stdlibug/1-2.html
index 64baa76..aaafc3d 100644
--- a/doc/stdlibug/1-2.html
+++ b/doc/stdlibug/1-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Product Overview</TITLE>
diff --git a/doc/stdlibug/1-3.html b/doc/stdlibug/1-3.html
index 73f810c..832c9cd 100644
--- a/doc/stdlibug/1-3.html
+++ b/doc/stdlibug/1-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Usage Notes</TITLE>
diff --git a/doc/stdlibug/1-4.html b/doc/stdlibug/1-4.html
index da85696..eed56ab 100644
--- a/doc/stdlibug/1-4.html
+++ b/doc/stdlibug/1-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Documentation Overview</TITLE>
diff --git a/doc/stdlibug/1-5.html b/doc/stdlibug/1-5.html
index 7ab069e..fbd8aeb 100644
--- a/doc/stdlibug/1-5.html
+++ b/doc/stdlibug/1-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>About This Manual</TITLE>
diff --git a/doc/stdlibug/1-6.html b/doc/stdlibug/1-6.html
index 343b006..65feaee 100644
--- a/doc/stdlibug/1-6.html
+++ b/doc/stdlibug/1-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Consulting Services and Training</TITLE>
diff --git a/doc/stdlibug/1-7.html b/doc/stdlibug/1-7.html
index 1a37641..34c5f44 100644
--- a/doc/stdlibug/1-7.html
+++ b/doc/stdlibug/1-7.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Technical Support</TITLE>
diff --git a/doc/stdlibug/1.html b/doc/stdlibug/1.html
index b37c2c1..5aaef97 100644
--- a/doc/stdlibug/1.html
+++ b/doc/stdlibug/1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/10-1.html b/doc/stdlibug/10-1.html
index cd4d6ff..36130ee 100644
--- a/doc/stdlibug/10-1.html
+++ b/doc/stdlibug/10-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/10-2.html b/doc/stdlibug/10-2.html
index e9731a8..7feaf7e 100644
--- a/doc/stdlibug/10-2.html
+++ b/doc/stdlibug/10-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The stack Data Abstraction</TITLE>
diff --git a/doc/stdlibug/10-3.html b/doc/stdlibug/10-3.html
index 0b71348..5b660de 100644
--- a/doc/stdlibug/10-3.html
+++ b/doc/stdlibug/10-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The queue Data Abstraction</TITLE>
diff --git a/doc/stdlibug/10.html b/doc/stdlibug/10.html
index 663530e..45a75a0 100644
--- a/doc/stdlibug/10.html
+++ b/doc/stdlibug/10.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Container Adaptors  stack and queue</TITLE>
diff --git a/doc/stdlibug/11-1.html b/doc/stdlibug/11-1.html
index 7e32998..0ba77e7 100644
--- a/doc/stdlibug/11-1.html
+++ b/doc/stdlibug/11-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The priority queue Data Abstraction</TITLE>
diff --git a/doc/stdlibug/11-2.html b/doc/stdlibug/11-2.html
index 8ac1864..3456097 100644
--- a/doc/stdlibug/11-2.html
+++ b/doc/stdlibug/11-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The priority queue Operations</TITLE>
diff --git a/doc/stdlibug/11-3.html b/doc/stdlibug/11-3.html
index 7e6727f..31c5902 100644
--- a/doc/stdlibug/11-3.html
+++ b/doc/stdlibug/11-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Program: Event-Driven Simulation</TITLE>
diff --git a/doc/stdlibug/11.html b/doc/stdlibug/11.html
index 8fed8a2..a41c35d 100644
--- a/doc/stdlibug/11.html
+++ b/doc/stdlibug/11.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Container Adaptor priority queue</TITLE>
diff --git a/doc/stdlibug/12-1.html b/doc/stdlibug/12-1.html
index d1f598d..b2f5228 100644
--- a/doc/stdlibug/12-1.html
+++ b/doc/stdlibug/12-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The string Abstraction</TITLE>
diff --git a/doc/stdlibug/12-2.html b/doc/stdlibug/12-2.html
index 0d1f592..56b7f85 100644
--- a/doc/stdlibug/12-2.html
+++ b/doc/stdlibug/12-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>string Operations</TITLE>
diff --git a/doc/stdlibug/12-3.html b/doc/stdlibug/12-3.html
index 4b16b6b..1046b69 100644
--- a/doc/stdlibug/12-3.html
+++ b/doc/stdlibug/12-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Function: Split a Line into Words</TITLE>
diff --git a/doc/stdlibug/12.html b/doc/stdlibug/12.html
index 7092e1a..26f77fd 100644
--- a/doc/stdlibug/12.html
+++ b/doc/stdlibug/12.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>string</TITLE>
diff --git a/doc/stdlibug/13-1.html b/doc/stdlibug/13-1.html
index 81f2039..1c93bb8 100644
--- a/doc/stdlibug/13-1.html
+++ b/doc/stdlibug/13-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/13-2.html b/doc/stdlibug/13-2.html
index 320a661..fae60c8 100644
--- a/doc/stdlibug/13-2.html
+++ b/doc/stdlibug/13-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Initialization Algorithms</TITLE>
diff --git a/doc/stdlibug/13-3.html b/doc/stdlibug/13-3.html
index 68a8a31..dd461a1 100644
--- a/doc/stdlibug/13-3.html
+++ b/doc/stdlibug/13-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Searching Operations</TITLE>
diff --git a/doc/stdlibug/13-4.html b/doc/stdlibug/13-4.html
index 93a6426..fc17583 100644
--- a/doc/stdlibug/13-4.html
+++ b/doc/stdlibug/13-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>In-Place Transformations</TITLE>
diff --git a/doc/stdlibug/13-5.html b/doc/stdlibug/13-5.html
index 28d1f79..cae839f 100644
--- a/doc/stdlibug/13-5.html
+++ b/doc/stdlibug/13-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Removal Algorithms</TITLE>
diff --git a/doc/stdlibug/13-6.html b/doc/stdlibug/13-6.html
index b4cd075..e80c107 100644
--- a/doc/stdlibug/13-6.html
+++ b/doc/stdlibug/13-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Scalar-Producing Algorithms</TITLE>
diff --git a/doc/stdlibug/13-7.html b/doc/stdlibug/13-7.html
index 7c9020e..353e92f 100644
--- a/doc/stdlibug/13-7.html
+++ b/doc/stdlibug/13-7.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Sequence-Generating Algorithms</TITLE>
diff --git a/doc/stdlibug/13-8.html b/doc/stdlibug/13-8.html
index c594ba7..ec59ed0 100644
--- a/doc/stdlibug/13-8.html
+++ b/doc/stdlibug/13-8.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The for_each() Algorithm</TITLE>
diff --git a/doc/stdlibug/13.html b/doc/stdlibug/13.html
index e45848e..80cb399 100644
--- a/doc/stdlibug/13.html
+++ b/doc/stdlibug/13.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Generic Algorithms</TITLE>
diff --git a/doc/stdlibug/14-1.html b/doc/stdlibug/14-1.html
index 5753875..0bdda29 100644
--- a/doc/stdlibug/14-1.html
+++ b/doc/stdlibug/14-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/14-2.html b/doc/stdlibug/14-2.html
index c2238dd..ff39b61 100644
--- a/doc/stdlibug/14-2.html
+++ b/doc/stdlibug/14-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Sorting Algorithms</TITLE>
diff --git a/doc/stdlibug/14-3.html b/doc/stdlibug/14-3.html
index b86561d..3c53085 100644
--- a/doc/stdlibug/14-3.html
+++ b/doc/stdlibug/14-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>nth Element</TITLE>
diff --git a/doc/stdlibug/14-4.html b/doc/stdlibug/14-4.html
index 32cf4f2..90aa752 100644
--- a/doc/stdlibug/14-4.html
+++ b/doc/stdlibug/14-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Binary Search</TITLE>
diff --git a/doc/stdlibug/14-5.html b/doc/stdlibug/14-5.html
index 41320c5..98ad382 100644
--- a/doc/stdlibug/14-5.html
+++ b/doc/stdlibug/14-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Merge Ordered Sequences</TITLE>
diff --git a/doc/stdlibug/14-6.html b/doc/stdlibug/14-6.html
index 41c2573..fa2bc14 100644
--- a/doc/stdlibug/14-6.html
+++ b/doc/stdlibug/14-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set Operations</TITLE>
diff --git a/doc/stdlibug/14-7.html b/doc/stdlibug/14-7.html
index 84e787a..fed3605 100644
--- a/doc/stdlibug/14-7.html
+++ b/doc/stdlibug/14-7.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>heap Operations</TITLE>
diff --git a/doc/stdlibug/14.html b/doc/stdlibug/14.html
index 03cf59e..8c5fb44 100644
--- a/doc/stdlibug/14.html
+++ b/doc/stdlibug/14.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Ordered Collection  Algorithms</TITLE>
diff --git a/doc/stdlibug/15-1.html b/doc/stdlibug/15-1.html
index 6e0bd13..f9f00de 100644
--- a/doc/stdlibug/15-1.html
+++ b/doc/stdlibug/15-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/15-2.html b/doc/stdlibug/15-2.html
index f7ccc60..2b30089 100644
--- a/doc/stdlibug/15-2.html
+++ b/doc/stdlibug/15-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Using Allocators with Existing C++ Standard Library Containers</TITLE>
diff --git a/doc/stdlibug/15-3.html b/doc/stdlibug/15-3.html
index b814126..0659a3b 100644
--- a/doc/stdlibug/15-3.html
+++ b/doc/stdlibug/15-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Building Your Own Allocators</TITLE>
diff --git a/doc/stdlibug/15.html b/doc/stdlibug/15.html
index 4276799..ed8339f 100644
--- a/doc/stdlibug/15.html
+++ b/doc/stdlibug/15.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Using Allocators</TITLE>
diff --git a/doc/stdlibug/16-1.html b/doc/stdlibug/16-1.html
index 07cddbd..de36679 100644
--- a/doc/stdlibug/16-1.html
+++ b/doc/stdlibug/16-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Extending the C++ Standard Library</TITLE>
diff --git a/doc/stdlibug/16-2.html b/doc/stdlibug/16-2.html
index ed39ccd..3514bc5 100644
--- a/doc/stdlibug/16-2.html
+++ b/doc/stdlibug/16-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Building on the Standard Containers</TITLE>
diff --git a/doc/stdlibug/16-3.html b/doc/stdlibug/16-3.html
index 8790433..b399f2b 100644
--- a/doc/stdlibug/16-3.html
+++ b/doc/stdlibug/16-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Creating Your Own Containers</TITLE>
diff --git a/doc/stdlibug/16-4.html b/doc/stdlibug/16-4.html
index 43f7314..dd0487c 100644
--- a/doc/stdlibug/16-4.html
+++ b/doc/stdlibug/16-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Tips and Techniques for Building Algorithms</TITLE>
diff --git a/doc/stdlibug/16.html b/doc/stdlibug/16.html
index 91a2a5f..d1c4d26 100644
--- a/doc/stdlibug/16.html
+++ b/doc/stdlibug/16.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Building Containers and Algorithms</TITLE>
diff --git a/doc/stdlibug/17-1.html b/doc/stdlibug/17-1.html
index 8b4762f..59eb2d9 100644
--- a/doc/stdlibug/17-1.html
+++ b/doc/stdlibug/17-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Defining the Problem</TITLE>
diff --git a/doc/stdlibug/17-2.html b/doc/stdlibug/17-2.html
index 957e902..fbc577f 100644
--- a/doc/stdlibug/17-2.html
+++ b/doc/stdlibug/17-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Using the Traits Technique</TITLE>
diff --git a/doc/stdlibug/17.html b/doc/stdlibug/17.html
index 2c687d3..bdc6ee3 100644
--- a/doc/stdlibug/17.html
+++ b/doc/stdlibug/17.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Traits Parameter</TITLE>
diff --git a/doc/stdlibug/18-1.html b/doc/stdlibug/18-1.html
index b8a2e2a..0339c54 100644
--- a/doc/stdlibug/18-1.html
+++ b/doc/stdlibug/18-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/18-2.html b/doc/stdlibug/18-2.html
index b0abfb8..a622b5f 100644
--- a/doc/stdlibug/18-2.html
+++ b/doc/stdlibug/18-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Standard Exception Hierarchy</TITLE>
diff --git a/doc/stdlibug/18-3.html b/doc/stdlibug/18-3.html
index d65f80b..3b082de 100644
--- a/doc/stdlibug/18-3.html
+++ b/doc/stdlibug/18-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Using Exceptions</TITLE>
diff --git a/doc/stdlibug/18-4.html b/doc/stdlibug/18-4.html
index b1ca427..9421a41 100644
--- a/doc/stdlibug/18-4.html
+++ b/doc/stdlibug/18-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Program: Exceptions</TITLE>
diff --git a/doc/stdlibug/18.html b/doc/stdlibug/18.html
index c530d09..5add1b1 100644
--- a/doc/stdlibug/18.html
+++ b/doc/stdlibug/18.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Exception Handling</TITLE>
diff --git a/doc/stdlibug/19-1.html b/doc/stdlibug/19-1.html
index 99c15b5..39479b4 100644
--- a/doc/stdlibug/19-1.html
+++ b/doc/stdlibug/19-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/19-2.html b/doc/stdlibug/19-2.html
index e77cb59..da7922f 100644
--- a/doc/stdlibug/19-2.html
+++ b/doc/stdlibug/19-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Declaration and Initialization of Autopointers</TITLE>
diff --git a/doc/stdlibug/19.html b/doc/stdlibug/19.html
index 976f781..b843aff 100644
--- a/doc/stdlibug/19.html
+++ b/doc/stdlibug/19.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>auto_ptr</TITLE>
diff --git a/doc/stdlibug/2-1.html b/doc/stdlibug/2-1.html
index c2cd903..43246cf 100644
--- a/doc/stdlibug/2-1.html
+++ b/doc/stdlibug/2-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Introduction to Iterators</TITLE>
diff --git a/doc/stdlibug/2-2.html b/doc/stdlibug/2-2.html
index d5dad50..cb22c17 100644
--- a/doc/stdlibug/2-2.html
+++ b/doc/stdlibug/2-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Varieties of Iterators</TITLE>
diff --git a/doc/stdlibug/2-3.html b/doc/stdlibug/2-3.html
index 86ffbef..bc4173e 100644
--- a/doc/stdlibug/2-3.html
+++ b/doc/stdlibug/2-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Stream Iterators</TITLE>
diff --git a/doc/stdlibug/2-4.html b/doc/stdlibug/2-4.html
index 88d9305..2653493 100644
--- a/doc/stdlibug/2-4.html
+++ b/doc/stdlibug/2-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Insert Iterators</TITLE>
diff --git a/doc/stdlibug/2-5.html b/doc/stdlibug/2-5.html
index 012a2b6..71987c7 100644
--- a/doc/stdlibug/2-5.html
+++ b/doc/stdlibug/2-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Iterator Operations</TITLE>
diff --git a/doc/stdlibug/2.html b/doc/stdlibug/2.html
index 13bf3f1..3a78505 100644
--- a/doc/stdlibug/2.html
+++ b/doc/stdlibug/2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Iterators</TITLE>
diff --git a/doc/stdlibug/20-1.html b/doc/stdlibug/20-1.html
index 6b107c4..6de5d74 100644
--- a/doc/stdlibug/20-1.html
+++ b/doc/stdlibug/20-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/20-2.html b/doc/stdlibug/20-2.html
index 45ec399..af4fc3c 100644
--- a/doc/stdlibug/20-2.html
+++ b/doc/stdlibug/20-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Creating and Using Complex Numbers</TITLE>
diff --git a/doc/stdlibug/20-3.html b/doc/stdlibug/20-3.html
index e2a180d..48a187c 100644
--- a/doc/stdlibug/20-3.html
+++ b/doc/stdlibug/20-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Program: Roots of a Polynomial</TITLE>
diff --git a/doc/stdlibug/20.html b/doc/stdlibug/20.html
index 4e85945..19adf7a 100644
--- a/doc/stdlibug/20.html
+++ b/doc/stdlibug/20.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>complex</TITLE>
diff --git a/doc/stdlibug/21-1.html b/doc/stdlibug/21-1.html
index f66601e..5f9a0bc 100644
--- a/doc/stdlibug/21-1.html
+++ b/doc/stdlibug/21-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/21-2.html b/doc/stdlibug/21-2.html
index 10c10ef..3bd3f8e 100644
--- a/doc/stdlibug/21-2.html
+++ b/doc/stdlibug/21-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Fundamental Datatypes</TITLE>
diff --git a/doc/stdlibug/21-3.html b/doc/stdlibug/21-3.html
index 6530351..65ddad3 100644
--- a/doc/stdlibug/21-3.html
+++ b/doc/stdlibug/21-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>numeric_limits Members</TITLE>
diff --git a/doc/stdlibug/21.html b/doc/stdlibug/21.html
index 86db080..7c42a77 100644
--- a/doc/stdlibug/21.html
+++ b/doc/stdlibug/21.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>numeric_limits</TITLE>
diff --git a/doc/stdlibug/22-1.html b/doc/stdlibug/22-1.html
index a775915..22aba42 100644
--- a/doc/stdlibug/22-1.html
+++ b/doc/stdlibug/22-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/22-2.html b/doc/stdlibug/22-2.html
index 0d9d199..77fa122 100644
--- a/doc/stdlibug/22-2.html
+++ b/doc/stdlibug/22-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Declaring a valarray</TITLE>
diff --git a/doc/stdlibug/22-3.html b/doc/stdlibug/22-3.html
index c73b871..74ad768 100644
--- a/doc/stdlibug/22-3.html
+++ b/doc/stdlibug/22-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Assignment Operators</TITLE>
diff --git a/doc/stdlibug/22-4.html b/doc/stdlibug/22-4.html
index 417b872..c36bfa0 100644
--- a/doc/stdlibug/22-4.html
+++ b/doc/stdlibug/22-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Element and Subset Access</TITLE>
diff --git a/doc/stdlibug/22-5.html b/doc/stdlibug/22-5.html
index 15b2272..4fdebb8 100644
--- a/doc/stdlibug/22-5.html
+++ b/doc/stdlibug/22-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Computed Assignment Operators</TITLE>
diff --git a/doc/stdlibug/22-6.html b/doc/stdlibug/22-6.html
index 566c816..322ec09 100644
--- a/doc/stdlibug/22-6.html
+++ b/doc/stdlibug/22-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Member Functions</TITLE>
diff --git a/doc/stdlibug/22-7.html b/doc/stdlibug/22-7.html
index d72fec0..c12509a 100644
--- a/doc/stdlibug/22-7.html
+++ b/doc/stdlibug/22-7.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Non-Member Functions</TITLE>
diff --git a/doc/stdlibug/22.html b/doc/stdlibug/22.html
index 73e9fdd..7568399 100644
--- a/doc/stdlibug/22.html
+++ b/doc/stdlibug/22.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>valarray</TITLE>
diff --git a/doc/stdlibug/23-1.html b/doc/stdlibug/23-1.html
index 8c05154..6cb6072 100644
--- a/doc/stdlibug/23-1.html
+++ b/doc/stdlibug/23-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Defining the Terms</TITLE>
diff --git a/doc/stdlibug/23-2.html b/doc/stdlibug/23-2.html
index 21b70e8..da58dbe 100644
--- a/doc/stdlibug/23-2.html
+++ b/doc/stdlibug/23-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Localizing Cultural Conventions</TITLE>
diff --git a/doc/stdlibug/23-3.html b/doc/stdlibug/23-3.html
index 04f57d7..6bacb07 100644
--- a/doc/stdlibug/23-3.html
+++ b/doc/stdlibug/23-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Character Encodings for Localizing Alphabets</TITLE>
diff --git a/doc/stdlibug/23-4.html b/doc/stdlibug/23-4.html
index 8037448..c3bac08 100644
--- a/doc/stdlibug/23-4.html
+++ b/doc/stdlibug/23-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Summary</TITLE>
diff --git a/doc/stdlibug/23.html b/doc/stdlibug/23.html
index bcd0129..184b520 100644
--- a/doc/stdlibug/23.html
+++ b/doc/stdlibug/23.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Internationalization and Localization</TITLE>
diff --git a/doc/stdlibug/24-1.html b/doc/stdlibug/24-1.html
index 7636706..c5c216c 100644
--- a/doc/stdlibug/24-1.html
+++ b/doc/stdlibug/24-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The C Locale</TITLE>
diff --git a/doc/stdlibug/24-2.html b/doc/stdlibug/24-2.html
index f683d4f..1097a96 100644
--- a/doc/stdlibug/24-2.html
+++ b/doc/stdlibug/24-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The C++ Locales</TITLE>
diff --git a/doc/stdlibug/24-3.html b/doc/stdlibug/24-3.html
index e2b8d45..c0ad59c 100644
--- a/doc/stdlibug/24-3.html
+++ b/doc/stdlibug/24-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Differences between the C Locale and the C++ Locales</TITLE>
diff --git a/doc/stdlibug/24-4.html b/doc/stdlibug/24-4.html
index c257476..d7c1781 100644
--- a/doc/stdlibug/24-4.html
+++ b/doc/stdlibug/24-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Locale Object</TITLE>
diff --git a/doc/stdlibug/24.html b/doc/stdlibug/24.html
index 111dc27..9a64ad9 100644
--- a/doc/stdlibug/24.html
+++ b/doc/stdlibug/24.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The C and C++ Locales</TITLE>
diff --git a/doc/stdlibug/25-1.html b/doc/stdlibug/25-1.html
index e39d3d1..2d9bef2 100644
--- a/doc/stdlibug/25-1.html
+++ b/doc/stdlibug/25-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Understanding Facet Types</TITLE>
diff --git a/doc/stdlibug/25-2.html b/doc/stdlibug/25-2.html
index 9e6c229..fea0d4b 100644
--- a/doc/stdlibug/25-2.html
+++ b/doc/stdlibug/25-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Facet Lifetimes</TITLE>
diff --git a/doc/stdlibug/25-3.html b/doc/stdlibug/25-3.html
index b09420e..565cd0b 100644
--- a/doc/stdlibug/25-3.html
+++ b/doc/stdlibug/25-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Accessing a Locale's Facets</TITLE>
diff --git a/doc/stdlibug/25-4.html b/doc/stdlibug/25-4.html
index b976715..621c165 100644
--- a/doc/stdlibug/25-4.html
+++ b/doc/stdlibug/25-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Using a Stream's Facet</TITLE>
diff --git a/doc/stdlibug/25-5.html b/doc/stdlibug/25-5.html
index 57c86e9..97474dd 100644
--- a/doc/stdlibug/25-5.html
+++ b/doc/stdlibug/25-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Modifying a Standard Facet's Behavior</TITLE>
diff --git a/doc/stdlibug/25-6.html b/doc/stdlibug/25-6.html
index baf2a19..9db7ffe 100644
--- a/doc/stdlibug/25-6.html
+++ b/doc/stdlibug/25-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Creating a New Base Facet Class</TITLE>
diff --git a/doc/stdlibug/25.html b/doc/stdlibug/25.html
index 7e659fb..95443c3 100644
--- a/doc/stdlibug/25.html
+++ b/doc/stdlibug/25.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Facets</TITLE>
diff --git a/doc/stdlibug/26-1.html b/doc/stdlibug/26-1.html
index a20fb0b..8ef68b5 100644
--- a/doc/stdlibug/26-1.html
+++ b/doc/stdlibug/26-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>An Example of Formatting Phone Numbers</TITLE>
diff --git a/doc/stdlibug/26-2.html b/doc/stdlibug/26-2.html
index 832279f..82c4d7f 100644
--- a/doc/stdlibug/26-2.html
+++ b/doc/stdlibug/26-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>A Phone Number Class</TITLE>
diff --git a/doc/stdlibug/26-3.html b/doc/stdlibug/26-3.html
index 542b3c9..989cb3a 100644
--- a/doc/stdlibug/26-3.html
+++ b/doc/stdlibug/26-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>A Phone Number Formatting Facet Class</TITLE>
diff --git a/doc/stdlibug/26-4.html b/doc/stdlibug/26-4.html
index de63e90..c25325b 100644
--- a/doc/stdlibug/26-4.html
+++ b/doc/stdlibug/26-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>An Inserter for Phone Numbers</TITLE>
diff --git a/doc/stdlibug/26-5.html b/doc/stdlibug/26-5.html
index a3bbd68..1ee776c 100644
--- a/doc/stdlibug/26-5.html
+++ b/doc/stdlibug/26-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Phone Number Facet Class Revisited</TITLE>
diff --git a/doc/stdlibug/26-6.html b/doc/stdlibug/26-6.html
index 48294a0..f842084 100644
--- a/doc/stdlibug/26-6.html
+++ b/doc/stdlibug/26-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>An Example of a Derived Facet Class</TITLE>
diff --git a/doc/stdlibug/26-7.html b/doc/stdlibug/26-7.html
index 6960833..8c5472d 100644
--- a/doc/stdlibug/26-7.html
+++ b/doc/stdlibug/26-7.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Using Phone Number Facets</TITLE>
diff --git a/doc/stdlibug/26-8.html b/doc/stdlibug/26-8.html
index 298ff4b..8361b84 100644
--- a/doc/stdlibug/26-8.html
+++ b/doc/stdlibug/26-8.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Formatting Phone Numbers</TITLE>
diff --git a/doc/stdlibug/26-9.html b/doc/stdlibug/26-9.html
index a9f581c..1464072 100644
--- a/doc/stdlibug/26-9.html
+++ b/doc/stdlibug/26-9.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Improving the Inserter Function</TITLE>
diff --git a/doc/stdlibug/26.html b/doc/stdlibug/26.html
index cde5bd9..6a9b409 100644
--- a/doc/stdlibug/26.html
+++ b/doc/stdlibug/26.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Building Your Own Facet Class</TITLE>
diff --git a/doc/stdlibug/27-1.html b/doc/stdlibug/27-1.html
index 56a8077..a1838b8 100644
--- a/doc/stdlibug/27-1.html
+++ b/doc/stdlibug/27-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Standard Iostreams</TITLE>
diff --git a/doc/stdlibug/27-2.html b/doc/stdlibug/27-2.html
index 0b031a6..c9f6261 100644
--- a/doc/stdlibug/27-2.html
+++ b/doc/stdlibug/27-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>How the Standard Iostreams Work</TITLE>
diff --git a/doc/stdlibug/27-3.html b/doc/stdlibug/27-3.html
index 207b8eb..407e2ea 100644
--- a/doc/stdlibug/27-3.html
+++ b/doc/stdlibug/27-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>How the Standard Iostreams Help Solve Problems</TITLE>
diff --git a/doc/stdlibug/27-4.html b/doc/stdlibug/27-4.html
index dcb6934..1ac9578 100644
--- a/doc/stdlibug/27-4.html
+++ b/doc/stdlibug/27-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Internal Structure of the Iostreams Layers</TITLE>
diff --git a/doc/stdlibug/27.html b/doc/stdlibug/27.html
index ce41bf4..6203589 100644
--- a/doc/stdlibug/27.html
+++ b/doc/stdlibug/27.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Architecture of Iostreams</TITLE>
diff --git a/doc/stdlibug/28-1.html b/doc/stdlibug/28-1.html
index 1fe486e..136f2de 100644
--- a/doc/stdlibug/28-1.html
+++ b/doc/stdlibug/28-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Predefined Streams</TITLE>
diff --git a/doc/stdlibug/28-2.html b/doc/stdlibug/28-2.html
index 3902235..351a4f3 100644
--- a/doc/stdlibug/28-2.html
+++ b/doc/stdlibug/28-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Input and Output Operators</TITLE>
diff --git a/doc/stdlibug/28-3.html b/doc/stdlibug/28-3.html
index ff7b495..6a4a608 100644
--- a/doc/stdlibug/28-3.html
+++ b/doc/stdlibug/28-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Format Control Using the Stream's Format State</TITLE>
diff --git a/doc/stdlibug/28-4.html b/doc/stdlibug/28-4.html
index 3d06d88..c3176c1 100644
--- a/doc/stdlibug/28-4.html
+++ b/doc/stdlibug/28-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Localization Using the Stream's Locale</TITLE>
diff --git a/doc/stdlibug/28-5.html b/doc/stdlibug/28-5.html
index abc9efb..6eef8a3 100644
--- a/doc/stdlibug/28-5.html
+++ b/doc/stdlibug/28-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Formatted Input</TITLE>
diff --git a/doc/stdlibug/28.html b/doc/stdlibug/28.html
index 3874f00..81a6333 100644
--- a/doc/stdlibug/28.html
+++ b/doc/stdlibug/28.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Formatted Input and Output</TITLE>
diff --git a/doc/stdlibug/29-1.html b/doc/stdlibug/29-1.html
index 0673f56..c2e550c 100644
--- a/doc/stdlibug/29-1.html
+++ b/doc/stdlibug/29-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>About Flags</TITLE>
diff --git a/doc/stdlibug/29-2.html b/doc/stdlibug/29-2.html
index 1646f10..1321ff6 100644
--- a/doc/stdlibug/29-2.html
+++ b/doc/stdlibug/29-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Checking the Stream State</TITLE>
diff --git a/doc/stdlibug/29-3.html b/doc/stdlibug/29-3.html
index b8594ea..e4471c2 100644
--- a/doc/stdlibug/29-3.html
+++ b/doc/stdlibug/29-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Catching Exceptions</TITLE>
diff --git a/doc/stdlibug/29.html b/doc/stdlibug/29.html
index 519a850..6f72132 100644
--- a/doc/stdlibug/29.html
+++ b/doc/stdlibug/29.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Error State of Streams</TITLE>
diff --git a/doc/stdlibug/3-1.html b/doc/stdlibug/3-1.html
index 3cf0e14..940b505 100644
--- a/doc/stdlibug/3-1.html
+++ b/doc/stdlibug/3-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Functions</TITLE>
diff --git a/doc/stdlibug/3-2.html b/doc/stdlibug/3-2.html
index aa984f9..69d0dcd 100644
--- a/doc/stdlibug/3-2.html
+++ b/doc/stdlibug/3-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Function Objects</TITLE>
diff --git a/doc/stdlibug/3-3.html b/doc/stdlibug/3-3.html
index 7965f77..489c0c8 100644
--- a/doc/stdlibug/3-3.html
+++ b/doc/stdlibug/3-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Predicates</TITLE>
diff --git a/doc/stdlibug/3-4.html b/doc/stdlibug/3-4.html
index 7a80f4d..cdf6f5a 100644
--- a/doc/stdlibug/3-4.html
+++ b/doc/stdlibug/3-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Function Adaptors</TITLE>
diff --git a/doc/stdlibug/3-5.html b/doc/stdlibug/3-5.html
index 1b36705..cdc6ccc 100644
--- a/doc/stdlibug/3-5.html
+++ b/doc/stdlibug/3-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Negators and Binders</TITLE>
diff --git a/doc/stdlibug/3.html b/doc/stdlibug/3.html
index c330e1e..64c700e 100644
--- a/doc/stdlibug/3.html
+++ b/doc/stdlibug/3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Functions and Predicates</TITLE>
diff --git a/doc/stdlibug/30-1.html b/doc/stdlibug/30-1.html
index 5a14451..ac182a2 100644
--- a/doc/stdlibug/30-1.html
+++ b/doc/stdlibug/30-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>About File Streams</TITLE>
diff --git a/doc/stdlibug/30-2.html b/doc/stdlibug/30-2.html
index b1feb87..b87a1f9 100644
--- a/doc/stdlibug/30-2.html
+++ b/doc/stdlibug/30-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Working with File Streams</TITLE>
diff --git a/doc/stdlibug/30-3.html b/doc/stdlibug/30-3.html
index 06a15c0..8ba0c32 100644
--- a/doc/stdlibug/30-3.html
+++ b/doc/stdlibug/30-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Open Mode</TITLE>
diff --git a/doc/stdlibug/30-4.html b/doc/stdlibug/30-4.html
index 52574ef..12e93a1 100644
--- a/doc/stdlibug/30-4.html
+++ b/doc/stdlibug/30-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Binary and Text Mode</TITLE>
@@ -7,10 +27,10 @@
 <H2>30.4 Binary and Text Mode</H2>
 <A NAME="idx764"><!></A>
 <A NAME="idx765"><!></A>
-<P>The representation of text files varies among operating systems. For example, the end of a line in a UNIX environment is represented by the <I>linefeed</I> character <SAMP>`\n'</SAMP>. On some other systems, such as Microsoft Windows, the end of the line consists of two characters, <I>carriage</I> <I>return</I> <SAMP>'\r'</SAMP> and <I>linefeed</I> <SAMP>'\n'</SAMP>. The end of the file differs as well on these two operating systems. Peculiarities on other operating systems are also conceivable.</P>
+<P>The representation of text files varies among operating systems. For example, the end of a line in a UNIX environment is represented by the <I>linefeed</I> character <SAMP>'\n'</SAMP>. On some other systems, such as Microsoft Windows, the end of the line consists of two characters, <I>carriage</I> <I>return</I> <SAMP>'\r'</SAMP> and <I>linefeed</I> <SAMP>'\n'</SAMP>. The end of the file differs as well on these two operating systems. Peculiarities on other operating systems are also conceivable.</P>
 <A NAME="idx766"><!></A>
-<P>To make programs more portable among operating systems, an automatic conversion can be done on input and output. The carriage return or linefeed sequence, for example, can be converted to a single <SAMP>`\n'</SAMP> character on input; the <SAMP>`\n'</SAMP> can be expanded to <SAMP>"\r\n"</SAMP> on output. This conversion mode is called <I>text mode</I>, as opposed to<I> binary mode</I>. In binary mode, no such conversions are performed.</P>
-<P>The mode flag <SAMP>std::ios_base::binary</SAMP> has the effect of opening a file in binary mode. This has the effect described above; in other words, all automatic conversions, such as converting <SAMP>"\r\n"</SAMP> to <SAMP>`\n',</SAMP> are suppressed. [Basically, the binary mode flag is passed on to the respective operating system's service function, which means that in principle all system-specific conversions are suppressed, not only the carriage return / linefeed handling.]</P>
+<P>To make programs more portable among operating systems, an automatic conversion can be done on input and output. The carriage return or linefeed sequence, for example, can be converted to a single <SAMP>'\n'</SAMP> character on input; the <SAMP>'\n'</SAMP> can be expanded to <SAMP>"\r\n"</SAMP> on output. This conversion mode is called <I>text mode</I>, as opposed to<I> binary mode</I>. In binary mode, no such conversions are performed.</P>
+<P>The mode flag <SAMP>std::ios_base::binary</SAMP> has the effect of opening a file in binary mode. This has the effect described above; in other words, all automatic conversions, such as converting <SAMP>"\r\n"</SAMP> to <SAMP>'\n',</SAMP> are suppressed. [Basically, the binary mode flag is passed on to the respective operating system's service function, which means that in principle all system-specific conversions are suppressed, not only the carriage return / linefeed handling.]</P>
 <P>If you must process a binary file, you should always set the <SAMP>binary</SAMP> mode flag, because most likely you do not want any kind of implicit, system-specific conversion performed.</P>
 <P>The effect of the binary open mode is frequently misunderstood. It does <I>not </I>put the inserters and extractors into a binary mode, and hence suppress the formatting they usually perform. Binary input and output is done solely by <SAMP>basic_istream&lt;&gt;::read()</SAMP> and <SAMP>basic_ostream&lt;&gt;::write()</SAMP>.</P>
 
diff --git a/doc/stdlibug/30-5.html b/doc/stdlibug/30-5.html
index f45d43c..06551f0 100644
--- a/doc/stdlibug/30-5.html
+++ b/doc/stdlibug/30-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>File Positioning</TITLE>
diff --git a/doc/stdlibug/30.html b/doc/stdlibug/30.html
index 2160019..c3f4b31 100644
--- a/doc/stdlibug/30.html
+++ b/doc/stdlibug/30.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>File Input and Output</TITLE>
diff --git a/doc/stdlibug/31-1.html b/doc/stdlibug/31-1.html
index 65ca0da..f619372 100644
--- a/doc/stdlibug/31-1.html
+++ b/doc/stdlibug/31-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>About String Streams</TITLE>
diff --git a/doc/stdlibug/31-2.html b/doc/stdlibug/31-2.html
index 879218d..ff0f5b2 100644
--- a/doc/stdlibug/31-2.html
+++ b/doc/stdlibug/31-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Internal Buffer</TITLE>
diff --git a/doc/stdlibug/31-3.html b/doc/stdlibug/31-3.html
index 83979f7..ddfad67 100644
--- a/doc/stdlibug/31-3.html
+++ b/doc/stdlibug/31-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Open Modes</TITLE>
diff --git a/doc/stdlibug/31.html b/doc/stdlibug/31.html
index 998d4f8..4f684ee 100644
--- a/doc/stdlibug/31.html
+++ b/doc/stdlibug/31.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Input and Output In Memory</TITLE>
diff --git a/doc/stdlibug/32-1.html b/doc/stdlibug/32-1.html
index f76593b..b96d507 100644
--- a/doc/stdlibug/32-1.html
+++ b/doc/stdlibug/32-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>A Note on User-Defined Types</TITLE>
diff --git a/doc/stdlibug/32-2.html b/doc/stdlibug/32-2.html
index 1554c0d..8b7e66f 100644
--- a/doc/stdlibug/32-2.html
+++ b/doc/stdlibug/32-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>An Example with a User-Defined Type</TITLE>
diff --git a/doc/stdlibug/32-3.html b/doc/stdlibug/32-3.html
index c9cfaa1..a74e02f 100644
--- a/doc/stdlibug/32-3.html
+++ b/doc/stdlibug/32-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>A Simple Extractor and Inserter for the Example</TITLE>
diff --git a/doc/stdlibug/32-4.html b/doc/stdlibug/32-4.html
index 7f2cd6e..ce73832 100644
--- a/doc/stdlibug/32-4.html
+++ b/doc/stdlibug/32-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Improved Extractors and Inserters</TITLE>
diff --git a/doc/stdlibug/32-5.html b/doc/stdlibug/32-5.html
index a79b329..05113d3 100644
--- a/doc/stdlibug/32-5.html
+++ b/doc/stdlibug/32-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>More Improved Extractors and Inserters</TITLE>
diff --git a/doc/stdlibug/32-6.html b/doc/stdlibug/32-6.html
index 53929d0..e015592 100644
--- a/doc/stdlibug/32-6.html
+++ b/doc/stdlibug/32-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Patterns for Extractors and Inserters of User-Defined Types</TITLE>
diff --git a/doc/stdlibug/32.html b/doc/stdlibug/32.html
index 3f01d29..4351b60 100644
--- a/doc/stdlibug/32.html
+++ b/doc/stdlibug/32.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Input and Output of User Types</TITLE>
diff --git a/doc/stdlibug/33-1.html b/doc/stdlibug/33-1.html
index 4e6ff28..611d77f 100644
--- a/doc/stdlibug/33-1.html
+++ b/doc/stdlibug/33-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>A Recap of Manipulators</TITLE>
diff --git a/doc/stdlibug/33-2.html b/doc/stdlibug/33-2.html
index b36b4c4..42b433e 100644
--- a/doc/stdlibug/33-2.html
+++ b/doc/stdlibug/33-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Manipulators without Parameters</TITLE>
diff --git a/doc/stdlibug/33-3.html b/doc/stdlibug/33-3.html
index b33e1f7..d9b8a28 100644
--- a/doc/stdlibug/33-3.html
+++ b/doc/stdlibug/33-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Manipulators with Parameters</TITLE>
diff --git a/doc/stdlibug/33.html b/doc/stdlibug/33.html
index c787a5e..7e9cede 100644
--- a/doc/stdlibug/33.html
+++ b/doc/stdlibug/33.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Manipulators</TITLE>
diff --git a/doc/stdlibug/34-1.html b/doc/stdlibug/34-1.html
index 0b8fc96..c0107ae 100644
--- a/doc/stdlibug/34-1.html
+++ b/doc/stdlibug/34-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Streams as Objects</TITLE>
diff --git a/doc/stdlibug/34-2.html b/doc/stdlibug/34-2.html
index 3d2c433..58d2407 100644
--- a/doc/stdlibug/34-2.html
+++ b/doc/stdlibug/34-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Copying and Assigning Stream Objects</TITLE>
diff --git a/doc/stdlibug/34-3.html b/doc/stdlibug/34-3.html
index 222c12b..357a7c5 100644
--- a/doc/stdlibug/34-3.html
+++ b/doc/stdlibug/34-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Sharing a Stream Buffer Among Streams</TITLE>
diff --git a/doc/stdlibug/34-4.html b/doc/stdlibug/34-4.html
index 9b628f2..9396fd8 100644
--- a/doc/stdlibug/34-4.html
+++ b/doc/stdlibug/34-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Copies of the Stream Buffer</TITLE>
diff --git a/doc/stdlibug/34.html b/doc/stdlibug/34.html
index b7f9add..e3f4215 100644
--- a/doc/stdlibug/34.html
+++ b/doc/stdlibug/34.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Streams and Stream Buffers</TITLE>
diff --git a/doc/stdlibug/35-1.html b/doc/stdlibug/35-1.html
index ed0be6a..0a73466 100644
--- a/doc/stdlibug/35-1.html
+++ b/doc/stdlibug/35-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Sharing Files Among Streams</TITLE>
diff --git a/doc/stdlibug/35-2.html b/doc/stdlibug/35-2.html
index bd34aff..3048e6f 100644
--- a/doc/stdlibug/35-2.html
+++ b/doc/stdlibug/35-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Explicit Synchronization</TITLE>
diff --git a/doc/stdlibug/35-3.html b/doc/stdlibug/35-3.html
index 0090c6b..3ff224b 100644
--- a/doc/stdlibug/35-3.html
+++ b/doc/stdlibug/35-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Implicit Synchronization Using the unitbuf Format Flag</TITLE>
diff --git a/doc/stdlibug/35-4.html b/doc/stdlibug/35-4.html
index 7222f9c..6463645 100644
--- a/doc/stdlibug/35-4.html
+++ b/doc/stdlibug/35-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Implicit Synchronization by Tying Streams</TITLE>
diff --git a/doc/stdlibug/35-5.html b/doc/stdlibug/35-5.html
index 5b81c61..8d11c94 100644
--- a/doc/stdlibug/35-5.html
+++ b/doc/stdlibug/35-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Synchronizing the Standard Iostream Objects</TITLE>
diff --git a/doc/stdlibug/35-6.html b/doc/stdlibug/35-6.html
index 8166655..37a3175 100644
--- a/doc/stdlibug/35-6.html
+++ b/doc/stdlibug/35-6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Synchronization with the C Standard I/O</TITLE>
diff --git a/doc/stdlibug/35.html b/doc/stdlibug/35.html
index c1c5650..1fa054b 100644
--- a/doc/stdlibug/35.html
+++ b/doc/stdlibug/35.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Synchronizing Streams</TITLE>
diff --git a/doc/stdlibug/36-1.html b/doc/stdlibug/36-1.html
index c6b41ca..4d83edd 100644
--- a/doc/stdlibug/36-1.html
+++ b/doc/stdlibug/36-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Adding Data to a Stream</TITLE>
diff --git a/doc/stdlibug/36-2.html b/doc/stdlibug/36-2.html
index b595556..8f92c30 100644
--- a/doc/stdlibug/36-2.html
+++ b/doc/stdlibug/36-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>An Example: Storing a Date Format String</TITLE>
diff --git a/doc/stdlibug/36-3.html b/doc/stdlibug/36-3.html
index 53e4253..711754d 100644
--- a/doc/stdlibug/36-3.html
+++ b/doc/stdlibug/36-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Another Look at the Date Format String</TITLE>
diff --git a/doc/stdlibug/36-4.html b/doc/stdlibug/36-4.html
index 3dbcb55..2a8f403 100644
--- a/doc/stdlibug/36-4.html
+++ b/doc/stdlibug/36-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Caveat</TITLE>
diff --git a/doc/stdlibug/36.html b/doc/stdlibug/36.html
index 96d64e0..49d22f7 100644
--- a/doc/stdlibug/36.html
+++ b/doc/stdlibug/36.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Stream Storage for Private Use</TITLE>
diff --git a/doc/stdlibug/37-1.html b/doc/stdlibug/37-1.html
index e59ed30..54d49b2 100644
--- a/doc/stdlibug/37-1.html
+++ b/doc/stdlibug/37-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Defining Callback Functions</TITLE>
diff --git a/doc/stdlibug/37-2.html b/doc/stdlibug/37-2.html
index f264941..75103a6 100644
--- a/doc/stdlibug/37-2.html
+++ b/doc/stdlibug/37-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>An Example</TITLE>
diff --git a/doc/stdlibug/37.html b/doc/stdlibug/37.html
index 1bfcd62..8e5084f 100644
--- a/doc/stdlibug/37.html
+++ b/doc/stdlibug/37.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Registration of Callback Functions</TITLE>
diff --git a/doc/stdlibug/38-1.html b/doc/stdlibug/38-1.html
index 0049f96..a8b1434 100644
--- a/doc/stdlibug/38-1.html
+++ b/doc/stdlibug/38-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Deriving a New Stream Type</TITLE>
diff --git a/doc/stdlibug/38-2.html b/doc/stdlibug/38-2.html
index a2cbb38..5dcb1a4 100644
--- a/doc/stdlibug/38-2.html
+++ b/doc/stdlibug/38-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Choosing a Base Class</TITLE>
diff --git a/doc/stdlibug/38-3.html b/doc/stdlibug/38-3.html
index 2d70a26..3871dfd 100644
--- a/doc/stdlibug/38-3.html
+++ b/doc/stdlibug/38-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Construction and Initialization</TITLE>
diff --git a/doc/stdlibug/38-4.html b/doc/stdlibug/38-4.html
index 7196529..1f7288c 100644
--- a/doc/stdlibug/38-4.html
+++ b/doc/stdlibug/38-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Example</TITLE>
diff --git a/doc/stdlibug/38-5.html b/doc/stdlibug/38-5.html
index a3014bf..98ffe9c 100644
--- a/doc/stdlibug/38-5.html
+++ b/doc/stdlibug/38-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Using iword/pword for RTTI in Derived Streams</TITLE>
diff --git a/doc/stdlibug/38.html b/doc/stdlibug/38.html
index fe6e17b..16df068 100644
--- a/doc/stdlibug/38.html
+++ b/doc/stdlibug/38.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Creating New Stream Classes by Derivation</TITLE>
diff --git a/doc/stdlibug/39-1.html b/doc/stdlibug/39-1.html
index 7d1de3f..5a68313 100644
--- a/doc/stdlibug/39-1.html
+++ b/doc/stdlibug/39-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Class basic_streambuf: the Sequence Abstraction</TITLE>
diff --git a/doc/stdlibug/39-2.html b/doc/stdlibug/39-2.html
index 68b906a..3fbc9af 100644
--- a/doc/stdlibug/39-2.html
+++ b/doc/stdlibug/39-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Deriving New Stream Buffer Classes</TITLE>
diff --git a/doc/stdlibug/39-3.html b/doc/stdlibug/39-3.html
index ac40976..a8a051c 100644
--- a/doc/stdlibug/39-3.html
+++ b/doc/stdlibug/39-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Connecting iostream and streambuf Objects</TITLE>
diff --git a/doc/stdlibug/39.html b/doc/stdlibug/39.html
index 3b22abe..7b859ec 100644
--- a/doc/stdlibug/39.html
+++ b/doc/stdlibug/39.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Stream Buffers</TITLE>
diff --git a/doc/stdlibug/4-1.html b/doc/stdlibug/4-1.html
index a77174e..0739611 100644
--- a/doc/stdlibug/4-1.html
+++ b/doc/stdlibug/4-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/4-2.html b/doc/stdlibug/4-2.html
index 9e6e504..300fce7 100644
--- a/doc/stdlibug/4-2.html
+++ b/doc/stdlibug/4-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Selecting a Container</TITLE>
diff --git a/doc/stdlibug/4-3.html b/doc/stdlibug/4-3.html
index 0830754..8cc5500 100644
--- a/doc/stdlibug/4-3.html
+++ b/doc/stdlibug/4-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Memory Management Issues</TITLE>
diff --git a/doc/stdlibug/4-4.html b/doc/stdlibug/4-4.html
index 20004a6..7d5ffe7 100644
--- a/doc/stdlibug/4-4.html
+++ b/doc/stdlibug/4-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Container Types Not Found in the C++ Standard Library</TITLE>
diff --git a/doc/stdlibug/4.html b/doc/stdlibug/4.html
index c8b3536..b1871d2 100644
--- a/doc/stdlibug/4.html
+++ b/doc/stdlibug/4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Container Classes</TITLE>
diff --git a/doc/stdlibug/40-1.html b/doc/stdlibug/40-1.html
index 21edeae..1fb092b 100644
--- a/doc/stdlibug/40-1.html
+++ b/doc/stdlibug/40-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Overview</TITLE>
diff --git a/doc/stdlibug/40-2.html b/doc/stdlibug/40-2.html
index 282eb53..f3d6266 100644
--- a/doc/stdlibug/40-2.html
+++ b/doc/stdlibug/40-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Categories of Code Conversions</TITLE>
diff --git a/doc/stdlibug/40-3.html b/doc/stdlibug/40-3.html
index 2683917..0f07ea4 100644
--- a/doc/stdlibug/40-3.html
+++ b/doc/stdlibug/40-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example 1: Defining a Narrow Character Code Conversion (ASCII &lt;-&gt; EBCDIC)</TITLE>
diff --git a/doc/stdlibug/40-4.html b/doc/stdlibug/40-4.html
index c809634..a71d0b0 100644
--- a/doc/stdlibug/40-4.html
+++ b/doc/stdlibug/40-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Error Indication in Code Conversion Facets</TITLE>
diff --git a/doc/stdlibug/40-5.html b/doc/stdlibug/40-5.html
index 09b0122..91765d1 100644
--- a/doc/stdlibug/40-5.html
+++ b/doc/stdlibug/40-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example 2: Defining a Multibyte Character Code Conversion (JIS &lt;-&gt; Unicode)</TITLE>
diff --git a/doc/stdlibug/40.html b/doc/stdlibug/40.html
index 4090b19..05f9a61 100644
--- a/doc/stdlibug/40.html
+++ b/doc/stdlibug/40.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Defining A Code Conversion Facet</TITLE>
diff --git a/doc/stdlibug/41-1.html b/doc/stdlibug/41-1.html
index 733b420..9754e76 100644
--- a/doc/stdlibug/41-1.html
+++ b/doc/stdlibug/41-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>User-Defined Character Types</TITLE>
diff --git a/doc/stdlibug/41-2.html b/doc/stdlibug/41-2.html
index 2ea1352..c31583c 100644
--- a/doc/stdlibug/41-2.html
+++ b/doc/stdlibug/41-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Defining Traits and Facets for User-Defined Types</TITLE>
diff --git a/doc/stdlibug/41-3.html b/doc/stdlibug/41-3.html
index db55042..0716e83 100644
--- a/doc/stdlibug/41-3.html
+++ b/doc/stdlibug/41-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Creating and Using Streams Instantiated on User-Defined Types</TITLE>
diff --git a/doc/stdlibug/41.html b/doc/stdlibug/41.html
index 9542093..6bf3f08 100644
--- a/doc/stdlibug/41.html
+++ b/doc/stdlibug/41.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Defining Your Own Character Types</TITLE>
diff --git a/doc/stdlibug/42-1.html b/doc/stdlibug/42-1.html
index 8eddb6b..e43a01d 100644
--- a/doc/stdlibug/42-1.html
+++ b/doc/stdlibug/42-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Locales and Iostreams</TITLE>
diff --git a/doc/stdlibug/42-2.html b/doc/stdlibug/42-2.html
index c54e268..adf975a 100644
--- a/doc/stdlibug/42-2.html
+++ b/doc/stdlibug/42-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>When to Imbue a New Locale</TITLE>
diff --git a/doc/stdlibug/42-3.html b/doc/stdlibug/42-3.html
index 2ab0c04..c9009c3 100644
--- a/doc/stdlibug/42-3.html
+++ b/doc/stdlibug/42-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>An Example</TITLE>
diff --git a/doc/stdlibug/42.html b/doc/stdlibug/42.html
index 18e17ac..7e40050 100644
--- a/doc/stdlibug/42.html
+++ b/doc/stdlibug/42.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Imbuing Locales</TITLE>
diff --git a/doc/stdlibug/43-1.html b/doc/stdlibug/43-1.html
index b52dffe..c1a8fa9 100644
--- a/doc/stdlibug/43-1.html
+++ b/doc/stdlibug/43-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Definition</TITLE>
diff --git a/doc/stdlibug/43-2.html b/doc/stdlibug/43-2.html
index 69308a1..7411d97 100644
--- a/doc/stdlibug/43-2.html
+++ b/doc/stdlibug/43-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Differences between Stream Iterators and Container Iterators</TITLE>
diff --git a/doc/stdlibug/43-3.html b/doc/stdlibug/43-3.html
index 26e8f6f..397a0de 100644
--- a/doc/stdlibug/43-3.html
+++ b/doc/stdlibug/43-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Error Indication by Stream Iterators</TITLE>
diff --git a/doc/stdlibug/43-4.html b/doc/stdlibug/43-4.html
index c989184..a0e0156 100644
--- a/doc/stdlibug/43-4.html
+++ b/doc/stdlibug/43-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Several Iterators on One Stream</TITLE>
diff --git a/doc/stdlibug/43.html b/doc/stdlibug/43.html
index f91d36c..4291071 100644
--- a/doc/stdlibug/43.html
+++ b/doc/stdlibug/43.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Stream Iterators</TITLE>
diff --git a/doc/stdlibug/44-1.html b/doc/stdlibug/44-1.html
index 9cc713d..1e5a53c 100644
--- a/doc/stdlibug/44-1.html
+++ b/doc/stdlibug/44-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Multithread-Safe: Level 2</TITLE>
diff --git a/doc/stdlibug/44-2.html b/doc/stdlibug/44-2.html
index 9ca198a..c2c32c4 100644
--- a/doc/stdlibug/44-2.html
+++ b/doc/stdlibug/44-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Locking Mechanism</TITLE>
diff --git a/doc/stdlibug/44.html b/doc/stdlibug/44.html
index b373815..f38a62b 100644
--- a/doc/stdlibug/44.html
+++ b/doc/stdlibug/44.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Iostreams and Multithreading</TITLE>
diff --git a/doc/stdlibug/45-1.html b/doc/stdlibug/45-1.html
index ad165e8..1ec8dc8 100644
--- a/doc/stdlibug/45-1.html
+++ b/doc/stdlibug/45-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The Character Type</TITLE>
diff --git a/doc/stdlibug/45-2.html b/doc/stdlibug/45-2.html
index f79fec6..0a7e9a6 100644
--- a/doc/stdlibug/45-2.html
+++ b/doc/stdlibug/45-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Internationalization</TITLE>
diff --git a/doc/stdlibug/45-3.html b/doc/stdlibug/45-3.html
index 1166cd4..e7a8ad0 100644
--- a/doc/stdlibug/45-3.html
+++ b/doc/stdlibug/45-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>File Streams</TITLE>
diff --git a/doc/stdlibug/45-4.html b/doc/stdlibug/45-4.html
index de78164..e4583d9 100644
--- a/doc/stdlibug/45-4.html
+++ b/doc/stdlibug/45-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>String Streams</TITLE>
diff --git a/doc/stdlibug/45-5.html b/doc/stdlibug/45-5.html
index d64fccb..a8b55e9 100644
--- a/doc/stdlibug/45-5.html
+++ b/doc/stdlibug/45-5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Streams with Assign</TITLE>
diff --git a/doc/stdlibug/45.html b/doc/stdlibug/45.html
index cea069f..23b6cb9 100644
--- a/doc/stdlibug/45.html
+++ b/doc/stdlibug/45.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Standard vs. Traditional Iostreams</TITLE>
diff --git a/doc/stdlibug/46-1.html b/doc/stdlibug/46-1.html
index bb9d463..963883b 100644
--- a/doc/stdlibug/46-1.html
+++ b/doc/stdlibug/46-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Extensions</TITLE>
diff --git a/doc/stdlibug/46.html b/doc/stdlibug/46.html
index e21c07d..89f3a3a 100644
--- a/doc/stdlibug/46.html
+++ b/doc/stdlibug/46.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Standard vs. Apache C++ Standard Library Iostreams</TITLE>
diff --git a/doc/stdlibug/5-1.html b/doc/stdlibug/5-1.html
index c773978..dd548e7 100644
--- a/doc/stdlibug/5-1.html
+++ b/doc/stdlibug/5-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The vector Data Abstraction</TITLE>
diff --git a/doc/stdlibug/5-2.html b/doc/stdlibug/5-2.html
index 160096a..246a6f2 100644
--- a/doc/stdlibug/5-2.html
+++ b/doc/stdlibug/5-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>vector Operations</TITLE>
diff --git a/doc/stdlibug/5-3.html b/doc/stdlibug/5-3.html
index c580784..a8aad13 100644
--- a/doc/stdlibug/5-3.html
+++ b/doc/stdlibug/5-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Boolean Vectors</TITLE>
diff --git a/doc/stdlibug/5-4.html b/doc/stdlibug/5-4.html
index 6401431..9211498 100644
--- a/doc/stdlibug/5-4.html
+++ b/doc/stdlibug/5-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Program: The Sieve of Eratosthenes</TITLE>
diff --git a/doc/stdlibug/5.html b/doc/stdlibug/5.html
index 4b01e53..c81aab3 100644
--- a/doc/stdlibug/5.html
+++ b/doc/stdlibug/5.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>vector and vector&lt;bool&gt;</TITLE>
diff --git a/doc/stdlibug/6-1.html b/doc/stdlibug/6-1.html
index d5926cd..d5c6113 100644
--- a/doc/stdlibug/6-1.html
+++ b/doc/stdlibug/6-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The list Data Abstraction</TITLE>
diff --git a/doc/stdlibug/6-2.html b/doc/stdlibug/6-2.html
index fb0d7aa..2b6f400 100644
--- a/doc/stdlibug/6-2.html
+++ b/doc/stdlibug/6-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>list Operations</TITLE>
diff --git a/doc/stdlibug/6-3.html b/doc/stdlibug/6-3.html
index ab6c00b..190080a 100644
--- a/doc/stdlibug/6-3.html
+++ b/doc/stdlibug/6-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Program: An Inventory System</TITLE>
diff --git a/doc/stdlibug/6.html b/doc/stdlibug/6.html
index 303a35f..b383bb7 100644
--- a/doc/stdlibug/6.html
+++ b/doc/stdlibug/6.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>list</TITLE>
diff --git a/doc/stdlibug/7-1.html b/doc/stdlibug/7-1.html
index 30a3696..0f3e3d4 100644
--- a/doc/stdlibug/7-1.html
+++ b/doc/stdlibug/7-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The deque Data Abstraction</TITLE>
diff --git a/doc/stdlibug/7-2.html b/doc/stdlibug/7-2.html
index e1622c7..b756343 100644
--- a/doc/stdlibug/7-2.html
+++ b/doc/stdlibug/7-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>deque Operations</TITLE>
diff --git a/doc/stdlibug/7-3.html b/doc/stdlibug/7-3.html
index 3201b32..4e62bbc 100644
--- a/doc/stdlibug/7-3.html
+++ b/doc/stdlibug/7-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Program: Radix Sort</TITLE>
diff --git a/doc/stdlibug/7.html b/doc/stdlibug/7.html
index 54ed289..4d72f65 100644
--- a/doc/stdlibug/7.html
+++ b/doc/stdlibug/7.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>deque</TITLE>
diff --git a/doc/stdlibug/8-1.html b/doc/stdlibug/8-1.html
index 09ea46a..84ec4f9 100644
--- a/doc/stdlibug/8-1.html
+++ b/doc/stdlibug/8-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The set Data Abstraction</TITLE>
diff --git a/doc/stdlibug/8-2.html b/doc/stdlibug/8-2.html
index 6c6f797..47d2d36 100644
--- a/doc/stdlibug/8-2.html
+++ b/doc/stdlibug/8-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set and multiset Operations</TITLE>
diff --git a/doc/stdlibug/8-3.html b/doc/stdlibug/8-3.html
index d42db85..d4af984 100644
--- a/doc/stdlibug/8-3.html
+++ b/doc/stdlibug/8-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Program: A Spelling Checker</TITLE>
diff --git a/doc/stdlibug/8-4.html b/doc/stdlibug/8-4.html
index 83752a2..3b5160a 100644
--- a/doc/stdlibug/8-4.html
+++ b/doc/stdlibug/8-4.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The bitset Abstraction</TITLE>
diff --git a/doc/stdlibug/8.html b/doc/stdlibug/8.html
index ef7ef0d..3180e6e 100644
--- a/doc/stdlibug/8.html
+++ b/doc/stdlibug/8.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>set, multiset, and bitset</TITLE>
diff --git a/doc/stdlibug/9-1.html b/doc/stdlibug/9-1.html
index 5d7b26c..9f4ed10 100644
--- a/doc/stdlibug/9-1.html
+++ b/doc/stdlibug/9-1.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>The map Data Abstraction</TITLE>
diff --git a/doc/stdlibug/9-2.html b/doc/stdlibug/9-2.html
index 97bc9b8..b31a237 100644
--- a/doc/stdlibug/9-2.html
+++ b/doc/stdlibug/9-2.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>map and multimap Operations</TITLE>
diff --git a/doc/stdlibug/9-3.html b/doc/stdlibug/9-3.html
index 1395760..1bc3054 100644
--- a/doc/stdlibug/9-3.html
+++ b/doc/stdlibug/9-3.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Example Programs</TITLE>
diff --git a/doc/stdlibug/9.html b/doc/stdlibug/9.html
index 1e48da2..3e7a2f1 100644
--- a/doc/stdlibug/9.html
+++ b/doc/stdlibug/9.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>map and multimap</TITLE>
diff --git a/doc/stdlibug/I.html b/doc/stdlibug/I.html
index 9466d2a..75c0962 100644
--- a/doc/stdlibug/I.html
+++ b/doc/stdlibug/I.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Introduction</TITLE>
diff --git a/doc/stdlibug/II.html b/doc/stdlibug/II.html
index f44f3d0..16a0831 100644
--- a/doc/stdlibug/II.html
+++ b/doc/stdlibug/II.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Fundamentals</TITLE>
diff --git a/doc/stdlibug/III.html b/doc/stdlibug/III.html
index 39de939..ea27914 100644
--- a/doc/stdlibug/III.html
+++ b/doc/stdlibug/III.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Containers</TITLE>
diff --git a/doc/stdlibug/IV.html b/doc/stdlibug/IV.html
index 5066097..57f333c 100644
--- a/doc/stdlibug/IV.html
+++ b/doc/stdlibug/IV.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Algorithms</TITLE>
diff --git a/doc/stdlibug/V.html b/doc/stdlibug/V.html
index 61a32a2..8a2ad36 100644
--- a/doc/stdlibug/V.html
+++ b/doc/stdlibug/V.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Special Techniques</TITLE>
diff --git a/doc/stdlibug/VI.html b/doc/stdlibug/VI.html
index 0f63498..31faeb9 100644
--- a/doc/stdlibug/VI.html
+++ b/doc/stdlibug/VI.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Special Classes</TITLE>
diff --git a/doc/stdlibug/VII.html b/doc/stdlibug/VII.html
index 1919e15..bba34e6 100644
--- a/doc/stdlibug/VII.html
+++ b/doc/stdlibug/VII.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Locales</TITLE>
diff --git a/doc/stdlibug/VIII.html b/doc/stdlibug/VIII.html
index 36405cd..f74b0f8 100644
--- a/doc/stdlibug/VIII.html
+++ b/doc/stdlibug/VIII.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Iostreams</TITLE>
diff --git a/doc/stdlibug/acknow.html b/doc/stdlibug/acknow.html
index 956ca71..0816806 100644
--- a/doc/stdlibug/acknow.html
+++ b/doc/stdlibug/acknow.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Acknowledgments</TITLE>
diff --git a/doc/stdlibug/booktoc.html b/doc/stdlibug/booktoc.html
index 3a8cd4c..12b7275 100644
--- a/doc/stdlibug/booktoc.html
+++ b/doc/stdlibug/booktoc.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Comprehensive Table of Contents</TITLE>
diff --git a/doc/stdlibug/contact.html b/doc/stdlibug/contact.html
index 6d3b0a3..9732831 100644
--- a/doc/stdlibug/contact.html
+++ b/doc/stdlibug/contact.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Contacting the Apache C++ Standard Library Team</TITLE>
diff --git a/doc/stdlibug/copyright.html b/doc/stdlibug/copyright.html
index 57d7604..8e9fc06 100644
--- a/doc/stdlibug/copyright.html
+++ b/doc/stdlibug/copyright.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Copyright Information</TITLE>
diff --git a/doc/stdlibug/frames-banner.html b/doc/stdlibug/frames-banner.html
index 769f34a..ac593f8 100644
--- a/doc/stdlibug/frames-banner.html
+++ b/doc/stdlibug/frames-banner.html
@@ -1,4 +1,24 @@
-<html>
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
+<HTML>
     <head>
         <title>Top navigation banner</title>
         <link rel=StyleSheet
diff --git a/doc/stdlibug/frames-contents-all.html b/doc/stdlibug/frames-contents-all.html
index 449f580..eb91095 100644
--- a/doc/stdlibug/frames-contents-all.html
+++ b/doc/stdlibug/frames-contents-all.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Comprehensive TOC Frames</TITLE>
diff --git a/doc/stdlibug/frames-contents-chapter.html b/doc/stdlibug/frames-contents-chapter.html
index a595739..8f0c489 100644
--- a/doc/stdlibug/frames-contents-chapter.html
+++ b/doc/stdlibug/frames-contents-chapter.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Chapter List</TITLE>
diff --git a/doc/stdlibug/frames-displayarea.html b/doc/stdlibug/frames-displayarea.html
index ca357f1..cf06639 100644
--- a/doc/stdlibug/frames-displayarea.html
+++ b/doc/stdlibug/frames-displayarea.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Display area frameset</TITLE>
diff --git a/doc/stdlibug/frames-intro-contents.html b/doc/stdlibug/frames-intro-contents.html
index baff8ae..588c7eb 100644
--- a/doc/stdlibug/frames-intro-contents.html
+++ b/doc/stdlibug/frames-intro-contents.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Introduction Contents</TITLE>
diff --git a/doc/stdlibug/frames-intro-text.html b/doc/stdlibug/frames-intro-text.html
index 49a60eb..8e4e032 100644
--- a/doc/stdlibug/frames-intro-text.html
+++ b/doc/stdlibug/frames-intro-text.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Welcome</TITLE>
diff --git a/doc/stdlibug/frames-tindex-contents.html b/doc/stdlibug/frames-tindex-contents.html
index 22e5079..8fa5423 100644
--- a/doc/stdlibug/frames-tindex-contents.html
+++ b/doc/stdlibug/frames-tindex-contents.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Frame-based index contents frame</TITLE>
diff --git a/doc/stdlibug/frames-tindex.html b/doc/stdlibug/frames-tindex.html
index 7333a0a..258af70 100644
--- a/doc/stdlibug/frames-tindex.html
+++ b/doc/stdlibug/frames-tindex.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Index frameset</TITLE>
diff --git a/doc/stdlibug/index.html b/doc/stdlibug/index.html
index d28aeb3..81da6e9 100644
--- a/doc/stdlibug/index.html
+++ b/doc/stdlibug/index.html
@@ -1,4 +1,24 @@
-<html>
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
+<HTML>
     <head>
         <title>Apache C++ Standard Library User's Guide</title>
         <link rel=StyleSheet
diff --git a/doc/stdlibug/lists.html b/doc/stdlibug/lists.html
index f545d75..6d073a9 100644
--- a/doc/stdlibug/lists.html
+++ b/doc/stdlibug/lists.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Table, Figure, and Examples List</TITLE>
diff --git a/doc/stdlibug/noframes.html b/doc/stdlibug/noframes.html
index 279b1cf..1d878dc 100644
--- a/doc/stdlibug/noframes.html
+++ b/doc/stdlibug/noframes.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>C++ Standard Library Module User's Guide</TITLE>
diff --git a/doc/stdlibug/tindex.html b/doc/stdlibug/tindex.html
index 35d791c..380f35d 100644
--- a/doc/stdlibug/tindex.html
+++ b/doc/stdlibug/tindex.html
@@ -1,3 +1,23 @@
+<!--
+    Licensed to the Apache Software  Foundation (ASF) under one or more
+    contributor  license agreements.  See  the NOTICE  file distributed
+    with  this  work  for  additional information  regarding  copyright
+    ownership.   The ASF  licenses this  file to  you under  the Apache
+    License, Version  2.0 (the  License); you may  not use  this file
+    except in  compliance with the License.   You may obtain  a copy of
+    the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the  License is distributed on an  "AS IS" BASIS,
+    WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+    implied.   See  the License  for  the  specific language  governing
+    permissions and limitations under the License.
+
+    Copyright 1999-2007 Rogue Wave Software, Inc.
+-->
+
 <HTML>
 <HEAD>
 <TITLE>Topic Index</TITLE>
diff --git a/etc/config/GNUmakefile.bin b/etc/config/GNUmakefile.bin
index 6bee848..56f4881 100644
--- a/etc/config/GNUmakefile.bin
+++ b/etc/config/GNUmakefile.bin
@@ -4,7 +4,27 @@
 #
 # makefile to build the C++ Standard library utility programs
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 
 include ../makefile.in
 
@@ -14,7 +34,7 @@
 ONE_REPOSITORY = 1
 include ../makefile.common
 
-TARGET    = exec localedef locale
+TARGET    = exec localedef locale gencat
 
 # locale sources and related 
 NLSDIR = $(TOPDIR)/etc/nls
@@ -54,9 +74,10 @@
   LDFLAGS += $(RPATH)$(LIBDIR)
 endif
 
-##############################################################################
+########################################################################
 #  TARGETS
-##############################################################################
+########################################################################
+
 all:  $(LIBDIR)/$(LIBNAME) $(TARGET) $(RUNTARGET)
 
 $(LIBDIR)/$(LIBNAME):
@@ -82,6 +103,12 @@
 	>> $(LOGFILE)
 	$(LD) $^ -o $@ $(LDFLAGS) $(LDLIBS) $(call CXX.repo,$<) $(TEEOPTS)
 
+# link the gencat utility
+gencat: gencat.o
+	@echo "$(LD) $^ -o $@ $(LDFLAGS) $(LDLIBS)" $(call CXX.repo,$<) \
+	>> $(LOGFILE)
+	$(LD) $^ -o $@ $(LDFLAGS) $(LDLIBS) $(call CXX.repo,$<) $(TEEOPTS)
+
 # build all locales with the localedef utility
 locales: localedef $(LOCALES)
 
diff --git a/etc/config/GNUmakefile.cfg b/etc/config/GNUmakefile.cfg
index 1778bd8..f30f504 100644
--- a/etc/config/GNUmakefile.cfg
+++ b/etc/config/GNUmakefile.cfg
@@ -4,7 +4,27 @@
 #
 # makefile to configure the C++ Standard library
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 #
 # Creates a C++ header file, config.h, containing a list of (possibly
 # commented out) preprocessor #defines in the form _RWSTD_NO_XXX,
@@ -32,7 +52,7 @@
 # Any output produced by the executable XXX obtained by compiling and
 # linking XXX.cpp is appended to the end of config.h.
 #
-##############################################################################
+########################################################################
 
 include ../makefile.in
 
@@ -130,9 +150,9 @@
     $(AR) $(ARFLAGS) $(1) $(2) >>$(LOGFILE)
 endef
 
-##############################################################################
+########################################################################
 #  TARGETS
-##############################################################################
+########################################################################
 
 all: config.h
 
@@ -326,9 +346,9 @@
 .PHONY: all clean config configure c_headers listtarget realclean run
 
 
-##############################################################################
+########################################################################
 #  COMMON RULES
-##############################################################################
+########################################################################
 
 #empty rule for .cc files so they won't be separately compiled
 %: %.cc ;
diff --git a/etc/config/GNUmakefile.exm b/etc/config/GNUmakefile.exm
index dcf95db..141fe53 100644
--- a/etc/config/GNUmakefile.exm
+++ b/etc/config/GNUmakefile.exm
@@ -4,7 +4,27 @@
 #
 # makefile to build the C++ Standard library examples
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 
 include  ../makefile.in
 
@@ -29,9 +49,9 @@
   LDFLAGS += $(RPATH)$(LIBDIR)
 endif
 
-##############################################################################
+########################################################################
 #  TARGETS
-##############################################################################
+########################################################################
 
 .SUFFIXES:
 
@@ -50,4 +70,7 @@
 realclean: dependclean clean
 	rm -f *.out
 
+#set TZ environment variable for examples
+run runall run_all: TZ = MST+7
+
 include ../makefile.rules
diff --git a/etc/config/GNUmakefile.lib b/etc/config/GNUmakefile.lib
index e92dedb..5632ef3 100644
--- a/etc/config/GNUmakefile.lib
+++ b/etc/config/GNUmakefile.lib
@@ -4,8 +4,27 @@
 #
 # makefile to build the C++ Standard library
 #
-##############################################################################
-
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 
 include ../makefile.in
 
@@ -47,8 +66,6 @@
 CXXFLAGS    += $(PICFLAGS)
 LDFLAGS     += $(LDSOFLAGS) $(MAPFLAGS) $(MAPFILE)
 
-# OBJS += $(shell [ -d ./cxx_repository/ ] && echo ./cxx_repository/*.o)
-
 # For AIX 5.1 xlC 5.0.2.0
 ifneq ($(DEFAULT_SHROBJ),)
   SOBJS=$(DEFAULT_SHROBJ)
@@ -62,9 +79,9 @@
 CXXPRELINK   = $(CXX) $(CPPFLAGS) $(LDFLAGS) $(PRELINKFLAGS) $(OBJS)
 endif   # ($(PRELINKFLAGS),)
 
-##############################################################################
+########################################################################
 #  TARGETS
-##############################################################################
+########################################################################
 
 # Cancel implicit rules
 .SUFFIXES:
@@ -98,6 +115,9 @@
 
 else
 
+# Compaq C++ needs all files from the repository
+SOBJS += $(shell [ -d repository.ti ] && echo repository.ti/*.o)
+
 $(LIB): $(OBJS)
 	@echo "$(CXXPRELINK)" >> $(LOGFILE)
 	$(CXXPRELINK) $(TEEOPTS)
diff --git a/etc/config/GNUmakefile.ph b/etc/config/GNUmakefile.ph
index 937a88e..dbf4161 100644
--- a/etc/config/GNUmakefile.ph
+++ b/etc/config/GNUmakefile.ph
@@ -1,16 +1,35 @@
 # -*- Makefile -*-
-##############################################################################
 #
 # $Id$
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 
 include ../makefile.in
 
 
-#########################################################
+########################################################################
 #  if PHDIR isn't set, don't try to build anything
-#########################################################
+########################################################################
 ifeq ($(PHDIR),)
 
 all: .DEFAULT
@@ -21,9 +40,9 @@
 .DEFAULT:
 	@echo "PHDIR not set; skipping Plum Hall tests"
 
-#########################################################
+########################################################################
 #  end of makefile if PHDIR isn't set
-#########################################################
+########################################################################
 
 else  # ifneq ($(PHDIR),)
 
@@ -51,9 +70,9 @@
   LDFLAGS += $(RPATH)$(LIBDIR)
 endif
 
-##############################################################################
+########################################################################
 #  TARGETS  
-##############################################################################
+########################################################################
 
 # first try to build all tests, then build subtests for
 # those tests that didn't compile
diff --git a/etc/config/GNUmakefile.rwt b/etc/config/GNUmakefile.rwt
index 7b3d89d..dcfe426 100644
--- a/etc/config/GNUmakefile.rwt
+++ b/etc/config/GNUmakefile.rwt
@@ -2,7 +2,27 @@
 #
 # $Id$
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 #
 # Usage:
 #
@@ -11,7 +31,7 @@
 #   To make all tests uder $(TOPDIR)/tests. Will generate a .d file
 #   an place in the directory $(DEPENDDIR) for every source file.
 #
-##############################################################################
+########################################################################
 
 # Generated when make is run in TOPDIR
 include ../makefile.in
@@ -55,9 +75,9 @@
   LDFLAGS += $(RPATH)$(LIBDIR)
 endif
 
-##############################################################################
+########################################################################
 #  TARGETS
-##############################################################################
+########################################################################
 
 all:  $(RWTESTLIB)
 
diff --git a/etc/config/GNUmakefile.tst b/etc/config/GNUmakefile.tst
index bbfd8fa..c0b2c5f 100644
--- a/etc/config/GNUmakefile.tst
+++ b/etc/config/GNUmakefile.tst
@@ -2,7 +2,27 @@
 #
 # $Id$
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 #
 # Usage:
 #
@@ -26,7 +46,7 @@
 #   Same as above, but considerably faster since SRCS doesn't have to be
 #   found in $(TOPDIR)/tests, and only the necessary .d files are included.
 #
-##############################################################################
+########################################################################
 
 include ../makefile.in
 
@@ -74,9 +94,9 @@
 # No test should use more than 1 GB of memory (See STDCXX-440).
 # The magic number 1073741824 is 1 GB in bytes.
 
-##############################################################################
+########################################################################
 #  TARGETS
-##############################################################################
+########################################################################
 
 all: $(TARGET)
 
diff --git a/etc/config/como.config b/etc/config/como.config
index 9882b56..9c8796a 100644
--- a/etc/config/como.config
+++ b/etc/config/como.config
@@ -4,6 +4,26 @@
 # configuration file for the Comeau compiler
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 CXX             = como
 CCVER          := $(shell $(CXX) -v foo.c 2>&1 | head -1 | awk '{ print $$3'})
diff --git a/etc/config/configure.sh b/etc/config/configure.sh
index 98bd74f..dcab229 100755
--- a/etc/config/configure.sh
+++ b/etc/config/configure.sh
@@ -5,6 +5,26 @@
 # script to configure the C++ Standard library
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 CONFIG_FILE="config.h"
 TOPDIR=":"
diff --git a/etc/config/eccp.config b/etc/config/eccp.config
index 77f72f2..352af98 100644
--- a/etc/config/eccp.config
+++ b/etc/config/eccp.config
@@ -4,6 +4,26 @@
 # configuration file for EDG eccp
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 CXX             = eccp
 CCVER          := $(shell eccp -v foo.c 2>&1 | head -1 | awk '{ print $$8'})
diff --git a/etc/config/fixtree.sh b/etc/config/fixtree.sh
index f0915f8..9b394d6 100755
--- a/etc/config/fixtree.sh
+++ b/etc/config/fixtree.sh
@@ -4,6 +4,26 @@
 #
 ##############################################################################
 #
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
+#
 # fixtree.sh - creates a source directory tree (using symlinks) suitable for
 # the GNUmakefile infrastructure from a directory tree required by HAL/RCB
 #
diff --git a/etc/config/gcc.config b/etc/config/gcc.config
index 1fef1f5..e697c41 100644
--- a/etc/config/gcc.config
+++ b/etc/config/gcc.config
@@ -5,6 +5,26 @@
 # configuration file for gcc
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 CXX    = gcc
 CCVER := $(shell $(CXX) -dumpversion | sed "s/[^0-9]*\([0-9.]*\).*/\1/g")
@@ -230,14 +250,12 @@
     endif
 else
     # on Cygwin use MingW-threads by default
-    MULTI_CPPFLAGS_POSIX = -mthreads
+    # -mthreads not defines _REENTRANT
+    MULTI_CPPFLAGS_POSIX = -D_REENTRANT -mthreads
     MULTI_LDFLAGS_POSIX  = -mthreads
 
     # link with libcatgets and libiconv
     LDLIBS += -lcatgets -liconv
-
-    # set the assembler file suffix to .s
-    AS_EXT = .s
 endif
 
 MULTI_CPPFLAGS_SOLARIS = -threads
diff --git a/etc/config/icc.config b/etc/config/icc.config
index d3ae07f..4bb9347 100644
--- a/etc/config/icc.config
+++ b/etc/config/icc.config
@@ -4,6 +4,26 @@
 # configuration file for Intel C++
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 CXX = icc
 
diff --git a/etc/config/makefile.common b/etc/config/makefile.common
index 1d5775d..63e5d35 100644
--- a/etc/config/makefile.common
+++ b/etc/config/makefile.common
@@ -4,7 +4,27 @@
 #
 # common makefile definitions shared by all GNUmakefile.*
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 
 SHELL        = /bin/sh 
 
diff --git a/etc/config/makefile.rules b/etc/config/makefile.rules
index e8b4f0d..f92e6c9 100644
--- a/etc/config/makefile.rules
+++ b/etc/config/makefile.rules
@@ -4,6 +4,28 @@
 #
 # common makefile rules shared by all GNUmakefile.*
 # 
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
+#
 # Running tests:
 # --------------
 # $ make [run | runall | run_all] [target] [target]... ; 
@@ -13,7 +35,7 @@
 #       runs all the tests producing a complete report
 # 
 # 
-##############################################################################
+########################################################################
 
 clean: cleantarget
 	rm -rf a.out core *.o *.i *.ii *.ti *.sh *.sta *.out  \
@@ -48,9 +70,9 @@
 	gencat $@ $^
 
 
-##############################################################################
+########################################################################
 #  COMMON RULES
-##############################################################################
+########################################################################
 
 ifeq ($(NO_DOT_O),)
 
@@ -112,15 +134,13 @@
 # PlumHall specific:
 # for all "top level" tests that failed to build, find and build all
 # subtests (the little tests the main test consists of)
-ifneq ($(LIBSUFFIX),.dll)
+ifeq (,$(findstring cygwin,$(PLATFORM)))
 
 run runall run_all: $(BINDIR)/exec
 	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
         PATH=$$PATH:.;                                                    \
         TOPDIR=$(TOPDIR);                                                 \
         TMP=$${TMP:-/tmp}/stdcxx-run-$$$$;                                \
-        TZ=MST+7;                                                         \
-        export TMP;                                                       \
         export LD_LIBRARY_PATH PATH TMP TOPDIR TZ;                        \
         trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT;                       \
         mkdir -p $$TMP;                                                   \
@@ -128,14 +148,12 @@
         exit 0)
 
 else
-# on Cygwin add $(LIBDIR) to PATH
+# on Cygwin add $(LIBDIR) and $(BINDIR) to PATH
 run runall run_all: $(BINDIR)/exec
 	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
-        PATH=$$PATH:$(LIBDIR):.;                                          \
+        PATH=$$PATH:$(LIBDIR):$(BINDIR):.;                                \
         TOPDIR=$(TOPDIR);                                                 \
         TMP=$${TMP:-/tmp}/stdcxx-run-$$$$;                                \
-        TZ=MST+7;                                                         \
-        export TMP;                                                       \
         export LD_LIBRARY_PATH PATH TMP TOPDIR TZ;                        \
         trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT;                       \
         mkdir -p $$TMP;                                                   \
@@ -186,7 +204,8 @@
                    s:$$RWTSRCDIR:$$""(TOPDIR)/\.\./rwtest:gp;                \
                    s:$(TOPDIR):$$""(TOPDIR):gp;                              \
                    s:$(BUILDDIR):$$""(BUILDDIR):gp" ;                        \
-	   depflags="$(value DEPENDFLAGS$(depsuffix))";                      \
+           depflags="$(value DEPENDFLAGS$(depsuffix))";                      \
+           [ "$$depflags" = "" ] && depflags=$(DEPENDFLAGS);                 \
            echo "$(CXX) $$depflags $(CPPFLAGS) $(CXXFLAGS) $<";              \
            $(CXX) $$depflags $(CPPFLAGS) $(CXXFLAGS) $<                      \
                | sed "$$sedexp1" | tr "@" "\n" | sed -n "$$sedexp2" >$@ ;    \
diff --git a/etc/config/mipspro.config b/etc/config/mipspro.config
index 6237460..248f633 100644
--- a/etc/config/mipspro.config
+++ b/etc/config/mipspro.config
@@ -5,6 +5,27 @@
 # configuration file for SGI MIPSpro on IRIX
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
+
 
 CXX             = CC
 CCVER          := $(shell $(CXX) -version 2>&1 | awk '{ print $$4 }')
@@ -34,6 +55,12 @@
 # with the native C++ Standard Library
 LDFLAGS        += -LANG:std=off
 
+# add libpthread to the list of libraries to link with
+ifeq ($(findstring pthread,$(BUILDMODE)),pthread)
+    LDLIBS := -lpthread
+endif
+
+
 # the extension of assembly files is .s
 AS_EXT = .s
 
@@ -62,7 +89,7 @@
 MULTI_CPPFLAGS_SOLARIS = 
 MULTI_CPPFLAGS_DCE     = 
 
-MULTI_LDFLAGS_POSIX    = -lpthread
+MULTI_LDFLAGS_POSIX    =
 MULTI_LDFLAGS_SOLARIS  = 
 MULTI_LDFLAGS_DCE      = 
 
diff --git a/etc/config/osf_cxx.config b/etc/config/osf_cxx.config
index 15c15f5..43dc569 100644
--- a/etc/config/osf_cxx.config
+++ b/etc/config/osf_cxx.config
@@ -4,6 +4,26 @@
 # configuration file DEC cxx on DEC OSF
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 CXX             = cxx
 CCVER          := $(shell $(CXX) -V 2>&1 | awk '{ print $$3 }')
diff --git a/etc/config/reliant_cds.config b/etc/config/reliant_cds.config
index c93d31c..be39c5e 100644
--- a/etc/config/reliant_cds.config
+++ b/etc/config/reliant_cds.config
@@ -4,6 +4,26 @@
 # configuration file for Siemens CDS++ on Reliant UNIX
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 CXX             = CC
 CCVER          := $(shell $(CXX) -V /bogus/file.cpp 2>&1 | head -1 | awk '{ print $4 }')
diff --git a/etc/config/run_locale_utils.sh b/etc/config/run_locale_utils.sh
index 562a348..408078a 100755
--- a/etc/config/run_locale_utils.sh
+++ b/etc/config/run_locale_utils.sh
@@ -20,7 +20,7 @@
 # implied.   See  the License  for  the  specific language  governing
 # permissions and limitations under the License.
 #
-# Copyright 2001-2006 Rogue Wave Software.
+# Copyright 1999-2007 Rogue Wave Software, Inc.
 #
 ##############################################################################
 #
diff --git a/etc/config/runall.sh b/etc/config/runall.sh
index 85f3042..1e99638 100755
--- a/etc/config/runall.sh
+++ b/etc/config/runall.sh
@@ -4,6 +4,26 @@
 #
 ##############################################################################
 #
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
+#
 # NAME
 #     runall.sh, run - run programs and analyze output
 #
diff --git a/etc/config/src/ABS_OVERLOADS.cpp b/etc/config/src/ABS_OVERLOADS.cpp
index 363bcda..e860e45 100644
--- a/etc/config/src/ABS_OVERLOADS.cpp
+++ b/etc/config/src/ABS_OVERLOADS.cpp
@@ -1,5 +1,27 @@
 // checking for overloads of abs()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // determine whether the abs() function (including
 // any overloads) is defined in the usual libc headers
 
diff --git a/etc/config/src/ATOMIC_OPS.cpp b/etc/config/src/ATOMIC_OPS.cpp
index c57ff67..19582b1 100644
--- a/etc/config/src/ATOMIC_OPS.cpp
+++ b/etc/config/src/ATOMIC_OPS.cpp
@@ -1,6 +1,28 @@
 // checking for atomic operations
 
-#if defined (_WIN32) || defined (_WIN64)
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
+#if defined (_WIN32) && !defined (_WIN64)
 
 #include <stdio.h>
 #include <windows.h>
@@ -34,7 +56,7 @@
     return 0;
 }
 
-#else   // not Windows
+#else   // not 32-bit Windows
 
 #include <stdio.h>
 
diff --git a/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp b/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp
index 164e904..da45719 100644
--- a/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp
+++ b/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_alloc assignment operator
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // NOTE: this file is #included from the following tests,
 //       each of which #defines bad_alloc to the name of
 //       the corresponding exception class, and exercises
diff --git a/etc/config/src/BAD_ALLOC_COPY_CTOR.cpp b/etc/config/src/BAD_ALLOC_COPY_CTOR.cpp
index ab49175..164d07d 100644
--- a/etc/config/src/BAD_ALLOC_COPY_CTOR.cpp
+++ b/etc/config/src/BAD_ALLOC_COPY_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_alloc copy ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_ALLOC_DEFAULT_CTOR.cpp b/etc/config/src/BAD_ALLOC_DEFAULT_CTOR.cpp
index 136a828..967109f 100644
--- a/etc/config/src/BAD_ALLOC_DEFAULT_CTOR.cpp
+++ b/etc/config/src/BAD_ALLOC_DEFAULT_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_alloc default ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_ALLOC_DTOR.cpp b/etc/config/src/BAD_ALLOC_DTOR.cpp
index 02334ea..309e1fb 100644
--- a/etc/config/src/BAD_ALLOC_DTOR.cpp
+++ b/etc/config/src/BAD_ALLOC_DTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_alloc dtor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_ALLOC_WHAT.cpp b/etc/config/src/BAD_ALLOC_WHAT.cpp
index a8da5f1..8f60332 100644
--- a/etc/config/src/BAD_ALLOC_WHAT.cpp
+++ b/etc/config/src/BAD_ALLOC_WHAT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_alloc::what()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_CAST_ASSIGNMENT.cpp b/etc/config/src/BAD_CAST_ASSIGNMENT.cpp
index 54b5d80..20b5109 100644
--- a/etc/config/src/BAD_CAST_ASSIGNMENT.cpp
+++ b/etc/config/src/BAD_CAST_ASSIGNMENT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_cast assignment operator
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_CAST_COPY_CTOR.cpp b/etc/config/src/BAD_CAST_COPY_CTOR.cpp
index 4842a10..fcb5b5f 100644
--- a/etc/config/src/BAD_CAST_COPY_CTOR.cpp
+++ b/etc/config/src/BAD_CAST_COPY_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_cast copy ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_CAST_DEFAULT_CTOR.cpp b/etc/config/src/BAD_CAST_DEFAULT_CTOR.cpp
index d5bca41..3a4680b 100644
--- a/etc/config/src/BAD_CAST_DEFAULT_CTOR.cpp
+++ b/etc/config/src/BAD_CAST_DEFAULT_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_cast default ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_CAST_DTOR.cpp b/etc/config/src/BAD_CAST_DTOR.cpp
index e8f8268..82715af 100644
--- a/etc/config/src/BAD_CAST_DTOR.cpp
+++ b/etc/config/src/BAD_CAST_DTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_cast dtor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_CAST_WHAT.cpp b/etc/config/src/BAD_CAST_WHAT.cpp
index 5a73e14..9d18712 100644
--- a/etc/config/src/BAD_CAST_WHAT.cpp
+++ b/etc/config/src/BAD_CAST_WHAT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_cast::what()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_EXCEPTION_ASSIGNMENT.cpp b/etc/config/src/BAD_EXCEPTION_ASSIGNMENT.cpp
index 56274d1..37c89c9 100644
--- a/etc/config/src/BAD_EXCEPTION_ASSIGNMENT.cpp
+++ b/etc/config/src/BAD_EXCEPTION_ASSIGNMENT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_exception assignment operator
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_EXCEPTION_COPY_CTOR.cpp b/etc/config/src/BAD_EXCEPTION_COPY_CTOR.cpp
index 7cade1f..d6e4ce2 100644
--- a/etc/config/src/BAD_EXCEPTION_COPY_CTOR.cpp
+++ b/etc/config/src/BAD_EXCEPTION_COPY_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_exception copy ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_EXCEPTION_DEFAULT_CTOR.cpp b/etc/config/src/BAD_EXCEPTION_DEFAULT_CTOR.cpp
index 493a43b..9a1733b 100644
--- a/etc/config/src/BAD_EXCEPTION_DEFAULT_CTOR.cpp
+++ b/etc/config/src/BAD_EXCEPTION_DEFAULT_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_exception default ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_EXCEPTION_DTOR.cpp b/etc/config/src/BAD_EXCEPTION_DTOR.cpp
index 8d20ceb..31c4e05 100644
--- a/etc/config/src/BAD_EXCEPTION_DTOR.cpp
+++ b/etc/config/src/BAD_EXCEPTION_DTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_exception dtor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_EXCEPTION_WHAT.cpp b/etc/config/src/BAD_EXCEPTION_WHAT.cpp
index 6575ed7..4f8d227 100644
--- a/etc/config/src/BAD_EXCEPTION_WHAT.cpp
+++ b/etc/config/src/BAD_EXCEPTION_WHAT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_exception::what()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_TYPEID_ASSIGNMENT.cpp b/etc/config/src/BAD_TYPEID_ASSIGNMENT.cpp
index df345c4..519e50c 100644
--- a/etc/config/src/BAD_TYPEID_ASSIGNMENT.cpp
+++ b/etc/config/src/BAD_TYPEID_ASSIGNMENT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_typeid assignment operator
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_TYPEID_COPY_CTOR.cpp b/etc/config/src/BAD_TYPEID_COPY_CTOR.cpp
index d56bb53..e91011c 100644
--- a/etc/config/src/BAD_TYPEID_COPY_CTOR.cpp
+++ b/etc/config/src/BAD_TYPEID_COPY_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_typeid copy ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_TYPEID_DEFAULT_CTOR.cpp b/etc/config/src/BAD_TYPEID_DEFAULT_CTOR.cpp
index 2cace45..c06de10 100644
--- a/etc/config/src/BAD_TYPEID_DEFAULT_CTOR.cpp
+++ b/etc/config/src/BAD_TYPEID_DEFAULT_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_typeid default ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_TYPEID_DTOR.cpp b/etc/config/src/BAD_TYPEID_DTOR.cpp
index 683668d..9423ebc 100644
--- a/etc/config/src/BAD_TYPEID_DTOR.cpp
+++ b/etc/config/src/BAD_TYPEID_DTOR.cpp
@@ -1,5 +1,27 @@
 // checking for bad_typeid dtor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BAD_TYPEID_WHAT.cpp b/etc/config/src/BAD_TYPEID_WHAT.cpp
index 9551c42..37035b8 100644
--- a/etc/config/src/BAD_TYPEID_WHAT.cpp
+++ b/etc/config/src/BAD_TYPEID_WHAT.cpp
@@ -1,5 +1,27 @@
 // checking for bad_typeid::what()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/BOOL.cpp b/etc/config/src/BOOL.cpp
index 8fa35fc..43f7754 100644
--- a/etc/config/src/BOOL.cpp
+++ b/etc/config/src/BOOL.cpp
@@ -1,5 +1,27 @@
 // checking bool, false, and true keywords
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 bool b = true && !false;
diff --git a/etc/config/src/CLASS_PARTIAL_SPEC.cpp b/etc/config/src/CLASS_PARTIAL_SPEC.cpp
index d8e8bb2..697657d 100644
--- a/etc/config/src/CLASS_PARTIAL_SPEC.cpp
+++ b/etc/config/src/CLASS_PARTIAL_SPEC.cpp
@@ -1,5 +1,27 @@
 // checking partial template specialization
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 // primary template
diff --git a/etc/config/src/COLLAPSE_STATIC_LOCALS.cpp b/etc/config/src/COLLAPSE_STATIC_LOCALS.cpp
index cece8b8..3e614f5 100644
--- a/etc/config/src/COLLAPSE_STATIC_LOCALS.cpp
+++ b/etc/config/src/COLLAPSE_STATIC_LOCALS.cpp
@@ -1,5 +1,27 @@
 // checking static locals in inline code
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/COLLAPSE_TEMPLATE_LOCALS.cpp b/etc/config/src/COLLAPSE_TEMPLATE_LOCALS.cpp
index e22675c..5b40b59 100644
--- a/etc/config/src/COLLAPSE_TEMPLATE_LOCALS.cpp
+++ b/etc/config/src/COLLAPSE_TEMPLATE_LOCALS.cpp
@@ -1,5 +1,27 @@
 // checking static locals in template code
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/COLLAPSE_TEMPLATE_STATICS.cpp b/etc/config/src/COLLAPSE_TEMPLATE_STATICS.cpp
index 640a0fa..0b1ba4a 100644
--- a/etc/config/src/COLLAPSE_TEMPLATE_STATICS.cpp
+++ b/etc/config/src/COLLAPSE_TEMPLATE_STATICS.cpp
@@ -1,5 +1,27 @@
 // checking static template members
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/CONST_CAST.cpp b/etc/config/src/CONST_CAST.cpp
index b186b1a..65a3157 100644
--- a/etc/config/src/CONST_CAST.cpp
+++ b/etc/config/src/CONST_CAST.cpp
@@ -1,5 +1,27 @@
 // checking for const_cast
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 const char *s1 = 0;
 char *s2 = const_cast<char*>(s1);
 const char *s3 = const_cast<const char*>(s2);
diff --git a/etc/config/src/CTYPE_BITS.cpp b/etc/config/src/CTYPE_BITS.cpp
index f2ae736..a5d30c2 100644
--- a/etc/config/src/CTYPE_BITS.cpp
+++ b/etc/config/src/CTYPE_BITS.cpp
@@ -1,5 +1,27 @@
 // checking for ctype constants
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <ctype.h>
 #include <stdio.h>
 
diff --git a/etc/config/src/CV_VOID_SPECIALIZATIONS.cpp b/etc/config/src/CV_VOID_SPECIALIZATIONS.cpp
index 9d509dd..6e2b905 100644
--- a/etc/config/src/CV_VOID_SPECIALIZATIONS.cpp
+++ b/etc/config/src/CV_VOID_SPECIALIZATIONS.cpp
@@ -1,5 +1,27 @@
 // checking for cv qualifiers on type void
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_NEW_CLASS_TEMPLATE_SYNTAX
diff --git a/etc/config/src/DAYLIGHT.cpp b/etc/config/src/DAYLIGHT.cpp
index 56f9d9b..fa67036 100644
--- a/etc/config/src/DAYLIGHT.cpp
+++ b/etc/config/src/DAYLIGHT.cpp
@@ -1,5 +1,27 @@
 // checking for daylight variable in <time.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <time.h>
 
 // check to see if the XSI extension to POSIX, daylight,
diff --git a/etc/config/src/DEFAULT_TEMPLATE_ARGS.cpp b/etc/config/src/DEFAULT_TEMPLATE_ARGS.cpp
index 0feae0f..bf2dc75 100644
--- a/etc/config/src/DEFAULT_TEMPLATE_ARGS.cpp
+++ b/etc/config/src/DEFAULT_TEMPLATE_ARGS.cpp
@@ -1,5 +1,27 @@
 // checking default template arguments
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 template <class T, class U = int>
diff --git a/etc/config/src/DEPENDENT_TEMPLATE.cpp b/etc/config/src/DEPENDENT_TEMPLATE.cpp
index ad4dc84..d054214 100644
--- a/etc/config/src/DEPENDENT_TEMPLATE.cpp
+++ b/etc/config/src/DEPENDENT_TEMPLATE.cpp
@@ -1,5 +1,27 @@
 // checking for dependent template
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_TYPENAME
diff --git a/etc/config/src/DEPRECATED_LIBC_IN_STD.cpp b/etc/config/src/DEPRECATED_LIBC_IN_STD.cpp
index 5876066..63937db 100644
--- a/etc/config/src/DEPRECATED_LIBC_IN_STD.cpp
+++ b/etc/config/src/DEPRECATED_LIBC_IN_STD.cpp
@@ -1,5 +1,27 @@
 // checking deprecated C headers and namespace std
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <ctype.h>
 #include <locale.h>
 #include <math.h>
diff --git a/etc/config/src/DIV_OVERLOADS.cpp b/etc/config/src/DIV_OVERLOADS.cpp
index c9164de..409e636 100644
--- a/etc/config/src/DIV_OVERLOADS.cpp
+++ b/etc/config/src/DIV_OVERLOADS.cpp
@@ -1,5 +1,27 @@
 // checking for overloads of div()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // determine whether the div() function (including
 // any overloads) is defined in the usual libc headers
 
diff --git a/etc/config/src/DUMMY_DEFAULT_ARG.cpp b/etc/config/src/DUMMY_DEFAULT_ARG.cpp
index 4915e4b..ac7b767 100644
--- a/etc/config/src/DUMMY_DEFAULT_ARG.cpp
+++ b/etc/config/src/DUMMY_DEFAULT_ARG.cpp
@@ -1,5 +1,27 @@
 // checking for dummy default arguments
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 T foo (const T* = 0) { return T (); }
 
diff --git a/etc/config/src/DYNAMIC_CAST.cpp b/etc/config/src/DYNAMIC_CAST.cpp
index db87aee..a6724fc 100644
--- a/etc/config/src/DYNAMIC_CAST.cpp
+++ b/etc/config/src/DYNAMIC_CAST.cpp
@@ -1,5 +1,27 @@
 // checking for dynamic_cast
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if (defined (_WIN32) || defined (_WIN64)) && !defined (__CYGWIN__)
diff --git a/etc/config/src/EMPTY_MEM_INITIALIZER.cpp b/etc/config/src/EMPTY_MEM_INITIALIZER.cpp
index 987b7e8..cd9a6c2 100644
--- a/etc/config/src/EMPTY_MEM_INITIALIZER.cpp
+++ b/etc/config/src/EMPTY_MEM_INITIALIZER.cpp
@@ -1,5 +1,27 @@
 // checking for empty mem-initializer arglist
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T, class U>
 struct S
 {
diff --git a/etc/config/src/EXCEPTIONS.cpp b/etc/config/src/EXCEPTIONS.cpp
index dd208f9..64abd51 100644
--- a/etc/config/src/EXCEPTIONS.cpp
+++ b/etc/config/src/EXCEPTIONS.cpp
@@ -1,5 +1,27 @@
 // checking exceptions
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_HONOR_STD
diff --git a/etc/config/src/EXCEPTION_ASSIGNMENT.cpp b/etc/config/src/EXCEPTION_ASSIGNMENT.cpp
index ae8cd54..9add329 100644
--- a/etc/config/src/EXCEPTION_ASSIGNMENT.cpp
+++ b/etc/config/src/EXCEPTION_ASSIGNMENT.cpp
@@ -1,5 +1,27 @@
 // checking for exception assignment operator
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/EXCEPTION_COPY_CTOR.cpp b/etc/config/src/EXCEPTION_COPY_CTOR.cpp
index 4175660..d341099 100644
--- a/etc/config/src/EXCEPTION_COPY_CTOR.cpp
+++ b/etc/config/src/EXCEPTION_COPY_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for exception copy ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/EXCEPTION_DEFAULT_CTOR.cpp b/etc/config/src/EXCEPTION_DEFAULT_CTOR.cpp
index cda14ae..607e609 100644
--- a/etc/config/src/EXCEPTION_DEFAULT_CTOR.cpp
+++ b/etc/config/src/EXCEPTION_DEFAULT_CTOR.cpp
@@ -1,5 +1,27 @@
 // checking for exception default ctor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/EXCEPTION_DTOR.cpp b/etc/config/src/EXCEPTION_DTOR.cpp
index a1ed90e..5a1702d 100644
--- a/etc/config/src/EXCEPTION_DTOR.cpp
+++ b/etc/config/src/EXCEPTION_DTOR.cpp
@@ -1,5 +1,27 @@
 // checking for exception dtor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/EXCEPTION_SPECIFICATION.cpp b/etc/config/src/EXCEPTION_SPECIFICATION.cpp
index 4ee7d77..d4bda95 100644
--- a/etc/config/src/EXCEPTION_SPECIFICATION.cpp
+++ b/etc/config/src/EXCEPTION_SPECIFICATION.cpp
@@ -1,5 +1,27 @@
 // checking exception specification
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <signal.h>
diff --git a/etc/config/src/EXCEPTION_SPECIFICATION_ON_NEW.cpp b/etc/config/src/EXCEPTION_SPECIFICATION_ON_NEW.cpp
index d127428..07a6430 100644
--- a/etc/config/src/EXCEPTION_SPECIFICATION_ON_NEW.cpp
+++ b/etc/config/src/EXCEPTION_SPECIFICATION_ON_NEW.cpp
@@ -1,5 +1,27 @@
 // checking for exception specification on new
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdlib.h>
 #include "config.h"
 
diff --git a/etc/config/src/EXCEPTION_WHAT.cpp b/etc/config/src/EXCEPTION_WHAT.cpp
index 7ada1d5..a82ecb9 100644
--- a/etc/config/src/EXCEPTION_WHAT.cpp
+++ b/etc/config/src/EXCEPTION_WHAT.cpp
@@ -1,5 +1,27 @@
 // checking for exception::what()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/EXPLICIT.cpp b/etc/config/src/EXPLICIT.cpp
index c470ecd..81786a2 100644
--- a/etc/config/src/EXPLICIT.cpp
+++ b/etc/config/src/EXPLICIT.cpp
@@ -1,5 +1,27 @@
 // checking explicit keyword
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 struct S
diff --git a/etc/config/src/EXPLICIT_ARG.cpp b/etc/config/src/EXPLICIT_ARG.cpp
index 930897c..60de0d0 100644
--- a/etc/config/src/EXPLICIT_ARG.cpp
+++ b/etc/config/src/EXPLICIT_ARG.cpp
@@ -1,5 +1,27 @@
 // checking explicit function template arguments
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/EXPLICIT_CTOR_INSTANTIATION.cpp b/etc/config/src/EXPLICIT_CTOR_INSTANTIATION.cpp
index 1593926..4c17794 100644
--- a/etc/config/src/EXPLICIT_CTOR_INSTANTIATION.cpp
+++ b/etc/config/src/EXPLICIT_CTOR_INSTANTIATION.cpp
@@ -1,5 +1,27 @@
 // checking for explicit instantiation of ctors
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 struct S
 {
diff --git a/etc/config/src/EXPLICIT_FUNC_INSTANTIATION.cpp b/etc/config/src/EXPLICIT_FUNC_INSTANTIATION.cpp
index 78fe721..c58ce0d 100644
--- a/etc/config/src/EXPLICIT_FUNC_INSTANTIATION.cpp
+++ b/etc/config/src/EXPLICIT_FUNC_INSTANTIATION.cpp
@@ -1,5 +1,27 @@
 // checking explicit function instantiation
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 template <class T>
diff --git a/etc/config/src/EXPLICIT_INSTANTIATION.cpp b/etc/config/src/EXPLICIT_INSTANTIATION.cpp
index 4322d67..a4f852d 100644
--- a/etc/config/src/EXPLICIT_INSTANTIATION.cpp
+++ b/etc/config/src/EXPLICIT_INSTANTIATION.cpp
@@ -1,5 +1,27 @@
 // checking for explicit instantiation
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // IMPLICIT_INSTANTIATION.cpp depends on foo<T>(T)
 template <class T>
 T foo (T t) { return t; }
diff --git a/etc/config/src/EXPLICIT_INSTANTIATION_BEFORE_DEFINITION.cpp b/etc/config/src/EXPLICIT_INSTANTIATION_BEFORE_DEFINITION.cpp
index 5296bd2..c1f6b51 100644
--- a/etc/config/src/EXPLICIT_INSTANTIATION_BEFORE_DEFINITION.cpp
+++ b/etc/config/src/EXPLICIT_INSTANTIATION_BEFORE_DEFINITION.cpp
@@ -1,5 +1,27 @@
 // checking for instantiation before definition
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_IMPLICIT_INCLUSION
diff --git a/etc/config/src/EXPLICIT_INSTANTIATION_WITH_IMPLICIT_INCLUSION.cpp b/etc/config/src/EXPLICIT_INSTANTIATION_WITH_IMPLICIT_INCLUSION.cpp
index 52e862d..893ed58 100644
--- a/etc/config/src/EXPLICIT_INSTANTIATION_WITH_IMPLICIT_INCLUSION.cpp
+++ b/etc/config/src/EXPLICIT_INSTANTIATION_WITH_IMPLICIT_INCLUSION.cpp
@@ -1,5 +1,27 @@
 // checking for explicit instantiation with implicit inclusion
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "instantiation_with_implicit_inclusion.h"
 
 template class S<short>;
diff --git a/etc/config/src/EXPLICIT_MEMBER_INSTANTIATION.cpp b/etc/config/src/EXPLICIT_MEMBER_INSTANTIATION.cpp
index fe755a8..0926da3 100644
--- a/etc/config/src/EXPLICIT_MEMBER_INSTANTIATION.cpp
+++ b/etc/config/src/EXPLICIT_MEMBER_INSTANTIATION.cpp
@@ -1,5 +1,27 @@
 // checking for explicit instantiation of members
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 T foo (T t) { return t; }
 
diff --git a/etc/config/src/EXPLICIT_MEMBER_SPECIALIZATION.cpp b/etc/config/src/EXPLICIT_MEMBER_SPECIALIZATION.cpp
index 2327df0..c0b44ad 100644
--- a/etc/config/src/EXPLICIT_MEMBER_SPECIALIZATION.cpp
+++ b/etc/config/src/EXPLICIT_MEMBER_SPECIALIZATION.cpp
@@ -1,5 +1,27 @@
 // checking for explicit member specialization
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 struct A
 {
     int i_;
diff --git a/etc/config/src/EXPORT.cpp b/etc/config/src/EXPORT.cpp
index 71de59c..255a56d 100644
--- a/etc/config/src/EXPORT.cpp
+++ b/etc/config/src/EXPORT.cpp
@@ -1,5 +1,27 @@
 // checking for exported templates
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_EXPORT_KEYWORD
diff --git a/etc/config/src/EXPORT_KEYWORD.cpp b/etc/config/src/EXPORT_KEYWORD.cpp
index 5479ccd..ae9dff7 100644
--- a/etc/config/src/EXPORT_KEYWORD.cpp
+++ b/etc/config/src/EXPORT_KEYWORD.cpp
@@ -1,5 +1,27 @@
 // checking for the export keyword
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 // NOTE: test EXPORT.cpp links with EXPORT_KEYOWRD.o and expects
 // to find a definition of the function template below there
diff --git a/etc/config/src/EXTERN_C_COMPATIBILITY.cpp b/etc/config/src/EXTERN_C_COMPATIBILITY.cpp
index 6c1c9e7..0db8a81 100644
--- a/etc/config/src/EXTERN_C_COMPATIBILITY.cpp
+++ b/etc/config/src/EXTERN_C_COMPATIBILITY.cpp
@@ -1,5 +1,27 @@
 // checking for compatibility of extern "C" and "C++"
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 extern "C" {
     typedef int (*ext_c_fun)();
 
diff --git a/etc/config/src/EXTERN_C_EXCEPTIONS.cpp b/etc/config/src/EXTERN_C_EXCEPTIONS.cpp
new file mode 100644
index 0000000..b0601bf
--- /dev/null
+++ b/etc/config/src/EXTERN_C_EXCEPTIONS.cpp
@@ -0,0 +1,79 @@
+// checking for exceptions from extern "C" functions
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
+// test tries to determine whether it's possible to throw exceptions
+// from functions with C language linkage
+
+extern "C" {
+
+int extern_c_function (int x, int y, int (*fun)(int, int))
+{
+    if (fun)
+        return fun (x, y);
+
+    return 0;
+
+}
+
+int div_throw (int x, int y)
+{
+    if (0 == y)
+        throw y;
+
+    return x / y;
+}
+
+int div_nothrow (int x, int y)
+{
+    if (0 == y)
+        return 0;
+
+    return x / y;
+
+}
+
+typedef int cfun_t (int, int);
+
+
+}   // extern "C"
+
+
+int main (int argc, char *argv[])
+{
+    const int x = argc < 2 ? 0 : int (*argv [1]);
+    const int y = argc < 3 ? 0 : int (*argv [2]);
+
+    cfun_t* pcfun = argc < 4 ? div_throw : div_nothrow;
+
+    int result;
+
+    try {
+        result = extern_c_function (x, y, pcfun);
+    }
+    catch (int res) {
+        result = res;
+    }
+
+    return result;
+}
diff --git a/etc/config/src/EXTERN_C_OVERLOAD.cpp b/etc/config/src/EXTERN_C_OVERLOAD.cpp
index 2335f5a..0172789 100644
--- a/etc/config/src/EXTERN_C_OVERLOAD.cpp
+++ b/etc/config/src/EXTERN_C_OVERLOAD.cpp
@@ -1,5 +1,27 @@
 // checking overloading on extern "C"
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 extern "C" {
 
     typedef int (*pf_t)(void);
diff --git a/etc/config/src/EXTERN_FUNCTION_TEMPLATE.cpp b/etc/config/src/EXTERN_FUNCTION_TEMPLATE.cpp
index 1e47a44..f54911e 100644
--- a/etc/config/src/EXTERN_FUNCTION_TEMPLATE.cpp
+++ b/etc/config/src/EXTERN_FUNCTION_TEMPLATE.cpp
@@ -1,5 +1,27 @@
 // checking for extern function template extension
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 // establish a dependency on extern_function_template_imp.{cpp,o}
diff --git a/etc/config/src/EXTERN_INLINE.cpp b/etc/config/src/EXTERN_INLINE.cpp
index 6933310..4be6f11 100644
--- a/etc/config/src/EXTERN_INLINE.cpp
+++ b/etc/config/src/EXTERN_INLINE.cpp
@@ -1,5 +1,27 @@
 // checking for truly extern inline
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp b/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp
index c363657..b0ba08a 100644
--- a/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp
+++ b/etc/config/src/EXTERN_MEMBER_TEMPLATE.cpp
@@ -1,5 +1,27 @@
 // checking for extern template extension
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 // establish dependencies on the config tests and define config
diff --git a/etc/config/src/EXTERN_TEMPLATE.cpp b/etc/config/src/EXTERN_TEMPLATE.cpp
index f2b8264..127e316 100644
--- a/etc/config/src/EXTERN_TEMPLATE.cpp
+++ b/etc/config/src/EXTERN_TEMPLATE.cpp
@@ -1,5 +1,27 @@
 // checking for extern template extension
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // include a file containing the definition of a template
 // and an extern template directive referencing an explicit
 // instantiation of the same template in extern_template_imp.o
diff --git a/etc/config/src/EXTERN_TEMPLATE_BEFORE_DEFINITION.cpp b/etc/config/src/EXTERN_TEMPLATE_BEFORE_DEFINITION.cpp
index 529310e..d575b14 100644
--- a/etc/config/src/EXTERN_TEMPLATE_BEFORE_DEFINITION.cpp
+++ b/etc/config/src/EXTERN_TEMPLATE_BEFORE_DEFINITION.cpp
@@ -1,5 +1,27 @@
 // checking for extern template before definition
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_extern_template_before_definition_imp
diff --git a/etc/config/src/FLOAT.cpp b/etc/config/src/FLOAT.cpp
index 67dff59..10baa33 100644
--- a/etc/config/src/FLOAT.cpp
+++ b/etc/config/src/FLOAT.cpp
@@ -1,5 +1,27 @@
 // computing floating point properties
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // working around a Compaq C++ headers problem (PR #27459)
 #if defined (__PURE_CNAME)
 #  undef __PURE_CNAME
@@ -43,21 +65,94 @@
 #ifndef _RWSTD_NO_FLOAT_H
 #  include <float.h>
 
-#  if defined (__EDG__) && defined (__linux__) && !defined (__INTEL_COMPILER)
+#  if defined (__EDG__) && !defined (__INTEL_COMPILER)
+     // define gcc 4 intrinsics otherwise not recognized
+     // by the front end
+#    define __FLT_DIG__              6
+#    define __FLT_EPSILON__          1.19209290e-7F
+#    define __FLT_MANT_DIG__        24
+#    define __FLT_MAX__              3.40282347e+38F
+#    define __FLT_MAX_10_EXP__      38
+#    define __FLT_MAX_EXP__        128
+#    define __FLT_MIN__              1.17549435e-38F
+#    define __FLT_MIN_10_EXP__     -37
+#    define __FLT_MIN_EXP__       -125
+#    define __FLT_RADIX__            2
 
-     // prevent the propriterary gcc __extension__ from
-     // throwing the vanilla EDG demo for a loop
+#    define __DBL_DIG__             15
+#    define __DBL_EPSILON__          2.2204460492503131e-16
+#    define __DBL_MANT_DIG__        53
+#    define __DBL_MAX__              1.7976931348623157e+308
+#    define __DBL_MAX_10_EXP__     308
+#    define __DBL_MAX_EXP__       1024
+#    define __DBL_MIN__              2.2250738585072014e-308
+#    define __DBL_MIN_10_EXP__    -307
+#    define __DBL_MIN_EXP__      -1021
 
-#    undef LDBL_EPSILON
-#    undef LDBL_MIN
-#    undef LDBL_MAX
+#    define __LDBL_DIG__            18
+#    define __LDBL_EPSILON__         1.08420217248550443401e-19L
+#    define __LDBL_MANT_DIG__       64
+#    define __LDBL_MAX__             1.18973149535723176502e+4932L
+#    define __LDBL_MAX_10_EXP__   4932
+#    define __LDBL_MAX_EXP__     16384
+#    define __LDBL_MIN__             3.36210314311209350626e-4932L
+#    define __LDBL_MIN_10_EXP__  -4931
+#    define __LDBL_MIN_EXP__    -16381
 
-     // redefine to prevent compilation errors
-#    define LDBL_EPSILON 1.0842021724855044e-19L
-#    define LDBL_MIN     3.3621031431120935e-4932L
-#    define LDBL_MAX     1.1897314953572317e+4932L
-#  endif   // __EDG__ && __linux__ && !__INTEL_COMPILER
+     // Linux value
+#    define _RWSTD_FLT_ROUNDS     1   /* round to nearest */
 
+#    if __GNUC__ < 4
+
+      // prevent the propriterary gcc __extension__ from
+      // throwing the vanilla EDG demo for a loop
+
+#      undef LDBL_EPSILON
+#      undef LDBL_MIN
+#      undef LDBL_MAX
+
+       // redefine to prevent compilation errors
+#      define LDBL_EPSILON 1.0842021724855044e-19L
+#      define LDBL_MIN     3.3621031431120935e-4932L
+#      define LDBL_MAX     1.1897314953572317e+4932L
+#    endif   //gcc 3 (as the back end for eccp)
+#  endif   //  EDG eccp vanilla front end
+#else   // if defined (_RWSTD_NO_FLOAT_H)
+   // assume IEEE 754 floating point
+   // FIXME: autodetect floating point format
+#  define FLT_DIG               6
+#  define FLT_EPSILON           1.19209290e-7F
+#  define FLT_MANT_DIG         24
+#  define FLT_MAX               3.40282347e+38F
+#  define FLT_MAX_10_EXP       38
+#  define FLT_MAX_EXP         128
+#  define FLT_MIN               1.17549435e-38F
+#  define FLT_MIN_10_EXP      -37
+#  define FLT_MIN_EXP        -125
+#  define FLT_RADIX             2
+
+#  define DBL_DIG              15
+#  define DBL_EPSILON           2.2204460492503131e-16
+#  define DBL_MANT_DIG         53
+#  define DBL_MAX               1.7976931348623157e+308
+#  define DBL_MAX_10_EXP      308
+#  define DBL_MAX_EXP        1024
+#  define DBL_MIN               2.2250738585072014e-308
+#  define DBL_MIN_10_EXP     -307
+#  define DBL_MIN_EXP       -1021
+
+#  define LDBL_DIG             18
+#  define LDBL_EPSILON          1.08420217248550443401e-19L
+#  define LDBL_MANT_DIG        64
+#  define LDBL_MAX              1.18973149535723176502e+4932L
+#  define LDBL_MAX_10_EXP    4932
+#  define LDBL_MAX_EXP      16384
+#  define LDBL_MIN              3.36210314311209350626e-4932L
+#  define LDBL_MIN_10_EXP   -4931
+#  define LDBL_MIN_EXP     -16381
+
+   // Linux value
+#  define _RWSTD_FLT_ROUNDS     1   /* round to nearest */
 #endif   // _RWSTD_NO_FLOAT_H
 
 
diff --git a/etc/config/src/FPOS_T.cpp b/etc/config/src/FPOS_T.cpp
index d14d407..b2681ea 100644
--- a/etc/config/src/FPOS_T.cpp
+++ b/etc/config/src/FPOS_T.cpp
@@ -1,5 +1,27 @@
 // checking for fpos_t in <stdio.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdio.h>
 
 #include "config.h"
diff --git a/etc/config/src/FRIEND_TEMPLATE.cpp b/etc/config/src/FRIEND_TEMPLATE.cpp
index a9da707..d8dccba 100644
--- a/etc/config/src/FRIEND_TEMPLATE.cpp
+++ b/etc/config/src/FRIEND_TEMPLATE.cpp
@@ -1,5 +1,27 @@
 // checking for friend templates of templates
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/FUNC.cpp b/etc/config/src/FUNC.cpp
index f4177d2..6403790 100644
--- a/etc/config/src/FUNC.cpp
+++ b/etc/config/src/FUNC.cpp
@@ -1,5 +1,27 @@
 // checking the __func__ special macro
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // 6.4.2.2, p1 of C99
 const char* func_test ()
 {
diff --git a/etc/config/src/FUNCTION_TRY_BLOCK.cpp b/etc/config/src/FUNCTION_TRY_BLOCK.cpp
index 9fa81ca..dfafa9d 100644
--- a/etc/config/src/FUNCTION_TRY_BLOCK.cpp
+++ b/etc/config/src/FUNCTION_TRY_BLOCK.cpp
@@ -1,5 +1,27 @@
 // checking function-try-block
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/FUNC_PARTIAL_SPEC.cpp b/etc/config/src/FUNC_PARTIAL_SPEC.cpp
index 5b4eebf..6257a75 100644
--- a/etc/config/src/FUNC_PARTIAL_SPEC.cpp
+++ b/etc/config/src/FUNC_PARTIAL_SPEC.cpp
@@ -1,5 +1,27 @@
 // checking function template overload
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T, class U>
 struct A { };
 
diff --git a/etc/config/src/GLOBAL_BAD_ALLOC.cpp b/etc/config/src/GLOBAL_BAD_ALLOC.cpp
index b4e8270..992349e 100644
--- a/etc/config/src/GLOBAL_BAD_ALLOC.cpp
+++ b/etc/config/src/GLOBAL_BAD_ALLOC.cpp
@@ -1,5 +1,27 @@
 // checking for class ::bad_alloc
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if !defined (_RWSTD_NO_NEW_THROWS) && !defined (_RWSTD_NO_NEW_OFLOW_SAFE)
diff --git a/etc/config/src/GLOBAL_BAD_CAST.cpp b/etc/config/src/GLOBAL_BAD_CAST.cpp
index 27465af..fad9e5f 100644
--- a/etc/config/src/GLOBAL_BAD_CAST.cpp
+++ b/etc/config/src/GLOBAL_BAD_CAST.cpp
@@ -1,5 +1,27 @@
 // checking for class ::bad_cast
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/GLOBAL_BAD_EXCEPTION.cpp b/etc/config/src/GLOBAL_BAD_EXCEPTION.cpp
index df104c2..e578f2e 100644
--- a/etc/config/src/GLOBAL_BAD_EXCEPTION.cpp
+++ b/etc/config/src/GLOBAL_BAD_EXCEPTION.cpp
@@ -1,5 +1,27 @@
 // checking for class ::bad_exception
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/GLOBAL_BAD_TYPEID.cpp b/etc/config/src/GLOBAL_BAD_TYPEID.cpp
index b272ae8..9c95da9 100644
--- a/etc/config/src/GLOBAL_BAD_TYPEID.cpp
+++ b/etc/config/src/GLOBAL_BAD_TYPEID.cpp
@@ -1,5 +1,27 @@
 // checking for class ::bad_typeid
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/GLOBAL_EXCEPTION.cpp b/etc/config/src/GLOBAL_EXCEPTION.cpp
index caccc32..6c106c0 100644
--- a/etc/config/src/GLOBAL_EXCEPTION.cpp
+++ b/etc/config/src/GLOBAL_EXCEPTION.cpp
@@ -1,5 +1,27 @@
 // checking for class ::exception
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/GLOBAL_NOTHROW.cpp b/etc/config/src/GLOBAL_NOTHROW.cpp
index 8dd1bfd..bb6fccb 100644
--- a/etc/config/src/GLOBAL_NOTHROW.cpp
+++ b/etc/config/src/GLOBAL_NOTHROW.cpp
@@ -1,5 +1,27 @@
 // checking for ::nothrow
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 struct nothrow_t { };
 
 extern const nothrow_t nothrow;
diff --git a/etc/config/src/GLOBAL_NOTHROW_T.cpp b/etc/config/src/GLOBAL_NOTHROW_T.cpp
index 800949d..fe3d4d9 100644
--- a/etc/config/src/GLOBAL_NOTHROW_T.cpp
+++ b/etc/config/src/GLOBAL_NOTHROW_T.cpp
@@ -1,5 +1,27 @@
 // checking for ::nothrow_t
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stddef.h>   // for size_t
 
 #include "config.h"
diff --git a/etc/config/src/GLOBAL_SET_NEW_HANDLER.cpp b/etc/config/src/GLOBAL_SET_NEW_HANDLER.cpp
index a61471c..957b487 100644
--- a/etc/config/src/GLOBAL_SET_NEW_HANDLER.cpp
+++ b/etc/config/src/GLOBAL_SET_NEW_HANDLER.cpp
@@ -1,5 +1,27 @@
 // checking for ::set_new_handler()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_EXCEPTION_SPECIFICATION
diff --git a/etc/config/src/GLOBAL_SET_TERMINATE.cpp b/etc/config/src/GLOBAL_SET_TERMINATE.cpp
index 8ddce77..45f734e 100644
--- a/etc/config/src/GLOBAL_SET_TERMINATE.cpp
+++ b/etc/config/src/GLOBAL_SET_TERMINATE.cpp
@@ -1,5 +1,27 @@
 // checking for ::set_terminate()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/GLOBAL_SET_UNEXPECTED.cpp b/etc/config/src/GLOBAL_SET_UNEXPECTED.cpp
index afd7560..ccc1355 100644
--- a/etc/config/src/GLOBAL_SET_UNEXPECTED.cpp
+++ b/etc/config/src/GLOBAL_SET_UNEXPECTED.cpp
@@ -1,5 +1,27 @@
 // checking for ::set_unexpected()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_EXCEPTION_SPECIFICATION
diff --git a/etc/config/src/GLOBAL_TERMINATE.cpp b/etc/config/src/GLOBAL_TERMINATE.cpp
index 2a8f288..c642ed0 100644
--- a/etc/config/src/GLOBAL_TERMINATE.cpp
+++ b/etc/config/src/GLOBAL_TERMINATE.cpp
@@ -1,5 +1,27 @@
 // checking for ::terminate()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 // looking for a definition in compiler support library
 void terminate ();
diff --git a/etc/config/src/GLOBAL_TYPE_INFO.cpp b/etc/config/src/GLOBAL_TYPE_INFO.cpp
index af8acbd..cec9797 100644
--- a/etc/config/src/GLOBAL_TYPE_INFO.cpp
+++ b/etc/config/src/GLOBAL_TYPE_INFO.cpp
@@ -1,5 +1,27 @@
 // checking for class ::type_info
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/GLOBAL_UNCAUGHT_EXCEPTION.cpp b/etc/config/src/GLOBAL_UNCAUGHT_EXCEPTION.cpp
index 5c56294..65b4dfe 100644
--- a/etc/config/src/GLOBAL_UNCAUGHT_EXCEPTION.cpp
+++ b/etc/config/src/GLOBAL_UNCAUGHT_EXCEPTION.cpp
@@ -1,5 +1,27 @@
 // checking for ::uncaught_exception()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/GLOBAL_UNEXPECTED.cpp b/etc/config/src/GLOBAL_UNEXPECTED.cpp
index 03744f1..422dcf5 100644
--- a/etc/config/src/GLOBAL_UNEXPECTED.cpp
+++ b/etc/config/src/GLOBAL_UNEXPECTED.cpp
@@ -1,5 +1,27 @@
 // checking for ::unexpected()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 // looking for a definition in compiler support library
 void unexpected ();
diff --git a/etc/config/src/HONOR_STD.cpp b/etc/config/src/HONOR_STD.cpp
index 669548c..670086f 100644
--- a/etc/config/src/HONOR_STD.cpp
+++ b/etc/config/src/HONOR_STD.cpp
@@ -1,5 +1,27 @@
 // checking if namespace std is honored
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 // g++ 2.9x ignores namespace std unless the -fhonor-std option is used
 
diff --git a/etc/config/src/ICONV.cpp b/etc/config/src/ICONV.cpp
index af4849a..cb01273 100644
--- a/etc/config/src/ICONV.cpp
+++ b/etc/config/src/ICONV.cpp
@@ -1,5 +1,27 @@
 // checking for iconv() in <iconv.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <iconv.h>
diff --git a/etc/config/src/ICONV_CONST_CHAR.cpp b/etc/config/src/ICONV_CONST_CHAR.cpp
index 9f08b1b..6239a1d 100644
--- a/etc/config/src/ICONV_CONST_CHAR.cpp
+++ b/etc/config/src/ICONV_CONST_CHAR.cpp
@@ -1,5 +1,27 @@
 // checking for POSIX iconv()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <iconv.h>
 
 int foo ()
diff --git a/etc/config/src/IMPLICIT_INCLUSION.cpp b/etc/config/src/IMPLICIT_INCLUSION.cpp
index c248744..088096c 100644
--- a/etc/config/src/IMPLICIT_INCLUSION.cpp
+++ b/etc/config/src/IMPLICIT_INCLUSION.cpp
@@ -1,5 +1,27 @@
 // checking for implicit file inclusion
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "implicit_inclusion_imp.h"
 
 int main ()
diff --git a/etc/config/src/IMPLICIT_INSTANTIATION.cpp b/etc/config/src/IMPLICIT_INSTANTIATION.cpp
index 03634a4..0547047 100644
--- a/etc/config/src/IMPLICIT_INSTANTIATION.cpp
+++ b/etc/config/src/IMPLICIT_INSTANTIATION.cpp
@@ -1,5 +1,27 @@
 // checking for implicit instantiation
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_EXPLICIT_INSTANTIATION
diff --git a/etc/config/src/INFINITY.cpp b/etc/config/src/INFINITY.cpp
index 12c2a8f..28d62fb 100644
--- a/etc/config/src/INFINITY.cpp
+++ b/etc/config/src/INFINITY.cpp
@@ -1,5 +1,27 @@
 // computing infinity and NaN's
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <float.h>    // for FLT_MIN, DBL_MIN, LDBL_MIN
 #include <stdio.h>    // for printf()
 
diff --git a/etc/config/src/INLINE_MEMBER_TEMPLATES.cpp b/etc/config/src/INLINE_MEMBER_TEMPLATES.cpp
index f641774..4feb0b1 100644
--- a/etc/config/src/INLINE_MEMBER_TEMPLATES.cpp
+++ b/etc/config/src/INLINE_MEMBER_TEMPLATES.cpp
@@ -1,5 +1,27 @@
 // checking for inline member templates
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 struct A
 {
     template <class T>
diff --git a/etc/config/src/INSTANTIATE_DEFAULT_ARGS.cpp b/etc/config/src/INSTANTIATE_DEFAULT_ARGS.cpp
index 26cb366..3ae1acc 100644
--- a/etc/config/src/INSTANTIATE_DEFAULT_ARGS.cpp
+++ b/etc/config/src/INSTANTIATE_DEFAULT_ARGS.cpp
@@ -1,5 +1,27 @@
 // checking if default args are instantiated
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/LCONV.cpp b/etc/config/src/LCONV.cpp
index 4fa2b02..3ceab97 100644
--- a/etc/config/src/LCONV.cpp
+++ b/etc/config/src/LCONV.cpp
@@ -1,5 +1,27 @@
 // checking for struct lconv in <locale.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <locale.h>   // for lconv
 #include <stddef.h>   // for offsetof, size_t
 #include <stdio.h>    // for printf
diff --git a/etc/config/src/LCONV_INT_FMAT.cpp b/etc/config/src/LCONV_INT_FMAT.cpp
index 9f06391..2a56a23 100644
--- a/etc/config/src/LCONV_INT_FMAT.cpp
+++ b/etc/config/src/LCONV_INT_FMAT.cpp
@@ -1,5 +1,27 @@
 // checking for C99 international lconv members
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <locale.h>
 
 int main ()
diff --git a/etc/config/src/LDBL_PRINTF_PREFIX.cpp b/etc/config/src/LDBL_PRINTF_PREFIX.cpp
index b662171..a82d0cb 100644
--- a/etc/config/src/LDBL_PRINTF_PREFIX.cpp
+++ b/etc/config/src/LDBL_PRINTF_PREFIX.cpp
@@ -1,5 +1,27 @@
 // checking for long double printf format prefix
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdio.h>
 
 #include "config.h"
diff --git a/etc/config/src/LIBC_EXCEPTION_SPEC.cpp b/etc/config/src/LIBC_EXCEPTION_SPEC.cpp
index df08813..b646278 100644
--- a/etc/config/src/LIBC_EXCEPTION_SPEC.cpp
+++ b/etc/config/src/LIBC_EXCEPTION_SPEC.cpp
@@ -1,5 +1,27 @@
 // checking for exception specification in libc
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdlib.h>
 
 extern "C" {
diff --git a/etc/config/src/LIBC_IN_STD.cpp b/etc/config/src/LIBC_IN_STD.cpp
index 0e77765..efca320 100644
--- a/etc/config/src/LIBC_IN_STD.cpp
+++ b/etc/config/src/LIBC_IN_STD.cpp
@@ -1,5 +1,27 @@
 // checking for C library in namespace std
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_NEW_HEADER
diff --git a/etc/config/src/LIB_EXCEPTIONS.cpp b/etc/config/src/LIB_EXCEPTIONS.cpp
index 2d4df70..3b0ce72 100644
--- a/etc/config/src/LIB_EXCEPTIONS.cpp
+++ b/etc/config/src/LIB_EXCEPTIONS.cpp
@@ -1,5 +1,27 @@
 // checking library exceptions
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if 0   // guard invalid preprocessor symbol below
diff --git a/etc/config/src/LIMITS.cpp b/etc/config/src/LIMITS.cpp
index 49455fd..511804c 100644
--- a/etc/config/src/LIMITS.cpp
+++ b/etc/config/src/LIMITS.cpp
@@ -1,8 +1,36 @@
 // computing numerical limits
 
+#include "config.h"
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdio.h>    // for printf()
 
-#include "config.h"
+#ifndef _RWSTD_NO_LIMITS_H
+   // avoid including broken <limits.h> (due to the use of #include_next)
+   // with EDG eccp on Linux
+#  include <limits.h>   // for MB_LEN_MAX
+#endif   // _RWSTD_NO_LIMITS_H
 
 
 // establish a dependency on the test for long long
@@ -336,14 +364,14 @@
 
 #ifndef _RWSTD_NO_WCHAR_T
 
-    printf ("#define _RWSTD_WCHAR_T_SIZE  %2u /* sizeof (wchar_t) */\n",
+    printf ("#define _RWSTD_WCHAR_SIZE  %2u /* sizeof (wchar_t) */\n",
             SIZEOF (wchar_t));
 
     const char *suffix = "U";
     if ((wchar_t)~0 < (wchar_t)0)
         suffix = "";
     
-    MKLIMITS (wchar_t, "WCHAR_T", suffix, "wchar_t");
+    MKLIMITS (wchar_t, "WCHAR", suffix, "wchar_t");
 
 #endif   // _RWSTD_NO_WCHAR_T
 
@@ -366,6 +394,8 @@
     printf ("#define _RWSTD_MB_LEN_MAX %d   /* known glibc 2.2 value */\n", 16);
 #  elif defined (__sun__) || defined (__sun) || defined (__sun)
     printf ("#define _RWSTD_MB_LEN_MAX %d   /* known SunOS libc value */\n", 5);
+#  elif defined (_WIN32)
+    printf ("#define _RWSTD_MB_LEN_MAX %d   /* known WIN32 libc value */\n", 5);
 #  else
     printf ("#define _RWSTD_MB_LEN_MAX %d   /* guess */\n", 8);
 #  endif
diff --git a/etc/config/src/LLONG_PRINTF_PREFIX.cpp b/etc/config/src/LLONG_PRINTF_PREFIX.cpp
index 0cd9e3f..f380749 100644
--- a/etc/config/src/LLONG_PRINTF_PREFIX.cpp
+++ b/etc/config/src/LLONG_PRINTF_PREFIX.cpp
@@ -1,5 +1,27 @@
 // checking for long long printf format prefix
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/etc/config/src/LOCALE_NAME_FMAT.cpp b/etc/config/src/LOCALE_NAME_FMAT.cpp
index e8993f1..edb6530 100644
--- a/etc/config/src/LOCALE_NAME_FMAT.cpp
+++ b/etc/config/src/LOCALE_NAME_FMAT.cpp
@@ -1,5 +1,27 @@
 // determining combined locale name format
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // If strict_ansi_errors is present, the definition of __PURE_CNAME 
 // dictates inclusion of  locale_cname_impl & locale_ansi_impl which 
 // do not define LC_MESSAGES locale category
diff --git a/etc/config/src/LONG_DOUBLE.cpp b/etc/config/src/LONG_DOUBLE.cpp
index 1dd7385..1145bfb 100644
--- a/etc/config/src/LONG_DOUBLE.cpp
+++ b/etc/config/src/LONG_DOUBLE.cpp
@@ -1,5 +1,27 @@
 // checking if long double is a native type
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 int foo (float)
diff --git a/etc/config/src/LONG_LONG.cpp b/etc/config/src/LONG_LONG.cpp
index d251aba..e8a2090 100644
--- a/etc/config/src/LONG_LONG.cpp
+++ b/etc/config/src/LONG_LONG.cpp
@@ -1,5 +1,27 @@
 // checking for long long
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 const char* foo (long long) { return "long long"; }
 const char* foo (unsigned long long) { return "unsigned long long"; }
diff --git a/etc/config/src/MADVISE.cpp b/etc/config/src/MADVISE.cpp
new file mode 100644
index 0000000..f6c7617
--- /dev/null
+++ b/etc/config/src/MADVISE.cpp
@@ -0,0 +1,20 @@
+// checking for madvise() in <sys/mman.h>
+
+#include <sys/mman.h>    // for madvise(), MADV_WILLNEED
+#include <sys/types.h>   // for caddr_t
+
+
+int main (int argc, char *argv[])
+{
+    const caddr_t addr = (caddr_t)argv;
+
+    const int result = madvise (addr, argc, MADV_WILLNEED);
+
+    if (1 < argc) {
+        // invoke with any command line arguments to test
+        return result;
+    }
+
+    // always succeed when invoked without arguments
+    return 0;
+}
diff --git a/etc/config/src/MATH_EXCEPTION.cpp b/etc/config/src/MATH_EXCEPTION.cpp
index c34a2dc..156963b 100644
--- a/etc/config/src/MATH_EXCEPTION.cpp
+++ b/etc/config/src/MATH_EXCEPTION.cpp
@@ -1,5 +1,27 @@
 // checking for struct exception in <math.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #ifdef __osf__
    // preemptive strike in case _OSF_SOURCE is #defined
 #  define _OSF_SOURCE
diff --git a/etc/config/src/MATH_OVERLOADS.cpp b/etc/config/src/MATH_OVERLOADS.cpp
index 3e7bc20..854133c 100644
--- a/etc/config/src/MATH_OVERLOADS.cpp
+++ b/etc/config/src/MATH_OVERLOADS.cpp
@@ -1,5 +1,27 @@
 // checking for function overloads in <math.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <math.h>
 #include <stdio.h>
 
diff --git a/etc/config/src/MBSTATE_T.cpp b/etc/config/src/MBSTATE_T.cpp
index a004123..3938686 100644
--- a/etc/config/src/MBSTATE_T.cpp
+++ b/etc/config/src/MBSTATE_T.cpp
@@ -1,5 +1,27 @@
 // checking for mbstate_t in <wchar.h> and <wctype.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 // defined to get the correct definition of mbstate_t, available on HPUX;
diff --git a/etc/config/src/MEMBER_TEMPLATES.cpp b/etc/config/src/MEMBER_TEMPLATES.cpp
index 0b4be96..07bb611 100644
--- a/etc/config/src/MEMBER_TEMPLATES.cpp
+++ b/etc/config/src/MEMBER_TEMPLATES.cpp
@@ -1,5 +1,27 @@
 // checking for member templates
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // both tests must successfully compile
 #include "INLINE_MEMBER_TEMPLATES.cpp"
 
diff --git a/etc/config/src/MEMBER_TEMPLATE_OVERLOAD.cpp b/etc/config/src/MEMBER_TEMPLATE_OVERLOAD.cpp
index 3bed19e..21a1bbc 100644
--- a/etc/config/src/MEMBER_TEMPLATE_OVERLOAD.cpp
+++ b/etc/config/src/MEMBER_TEMPLATE_OVERLOAD.cpp
@@ -1,5 +1,27 @@
 // checking for member template overloads on return type
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T, class U, class V>
 struct A { };
 
diff --git a/etc/config/src/MUNMAP.cpp b/etc/config/src/MUNMAP.cpp
index c66846e..1f5569d 100644
--- a/etc/config/src/MUNMAP.cpp
+++ b/etc/config/src/MUNMAP.cpp
@@ -1,5 +1,27 @@
 // checking for munmap() in <sys/mman.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 // include <sys/types.h> first in case mman.h depends
diff --git a/etc/config/src/NAMESPACE.cpp b/etc/config/src/NAMESPACE.cpp
index 3cfddfe..f0a272f 100644
--- a/etc/config/src/NAMESPACE.cpp
+++ b/etc/config/src/NAMESPACE.cpp
@@ -1,5 +1,27 @@
 // checking for namespaces
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 namespace A {
 
 struct AA { };
diff --git a/etc/config/src/NATIVE_WCHAR_T.cpp b/etc/config/src/NATIVE_WCHAR_T.cpp
index df4e8b3..80e2c08 100644
--- a/etc/config/src/NATIVE_WCHAR_T.cpp
+++ b/etc/config/src/NATIVE_WCHAR_T.cpp
@@ -1,5 +1,27 @@
 // checking if wchar_t is a native type
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 int foo (wchar_t)
diff --git a/etc/config/src/NESTED_CLASS_ACCESS.cpp b/etc/config/src/NESTED_CLASS_ACCESS.cpp
index dfd46fc..8054d1a 100644
--- a/etc/config/src/NESTED_CLASS_ACCESS.cpp
+++ b/etc/config/src/NESTED_CLASS_ACCESS.cpp
@@ -1,5 +1,27 @@
 // checking member class access
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 struct A
 {
 private:
diff --git a/etc/config/src/NEWLINE.cpp b/etc/config/src/NEWLINE.cpp
index 4b5fc8e..b26c48b 100644
--- a/etc/config/src/NEWLINE.cpp
+++ b/etc/config/src/NEWLINE.cpp
@@ -1,5 +1,27 @@
 // checking for newline (CR or CR-LF)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdio.h>
 
 #include "config.h"
diff --git a/etc/config/src/NEW_CLASS_TEMPLATE_SYNTAX.cpp b/etc/config/src/NEW_CLASS_TEMPLATE_SYNTAX.cpp
index a814404..08d24e3 100644
--- a/etc/config/src/NEW_CLASS_TEMPLATE_SYNTAX.cpp
+++ b/etc/config/src/NEW_CLASS_TEMPLATE_SYNTAX.cpp
@@ -1,5 +1,27 @@
 // checking class template specialization
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 template <class T>
diff --git a/etc/config/src/NEW_FUNC_TEMPLATE_SYNTAX.cpp b/etc/config/src/NEW_FUNC_TEMPLATE_SYNTAX.cpp
index a3775b4..1195620 100644
--- a/etc/config/src/NEW_FUNC_TEMPLATE_SYNTAX.cpp
+++ b/etc/config/src/NEW_FUNC_TEMPLATE_SYNTAX.cpp
@@ -1,5 +1,27 @@
 // checking template specialization syntax
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 template <class T>
 int foo (T)
diff --git a/etc/config/src/NEW_HEADER.cpp b/etc/config/src/NEW_HEADER.cpp
index 469dfc9..678cf9e 100644
--- a/etc/config/src/NEW_HEADER.cpp
+++ b/etc/config/src/NEW_HEADER.cpp
@@ -1,5 +1,27 @@
 // checking for C++-style C library headers
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <cassert>
 #include <cctype>
 #include <cerrno>
diff --git a/etc/config/src/NEW_THROWS.cpp b/etc/config/src/NEW_THROWS.cpp
index 529041c..08413a2 100644
--- a/etc/config/src/NEW_THROWS.cpp
+++ b/etc/config/src/NEW_THROWS.cpp
@@ -1,5 +1,27 @@
 // checking if operator new() throws
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/etc/config/src/NL_LANGINFO.cpp b/etc/config/src/NL_LANGINFO.cpp
index f170b7e..ae823ab 100644
--- a/etc/config/src/NL_LANGINFO.cpp
+++ b/etc/config/src/NL_LANGINFO.cpp
@@ -1,5 +1,27 @@
 // checking for nl_langinfo() in <langinfo.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <langinfo.h>
 
 // compile and link to make sure nl_langinfo() is not only
diff --git a/etc/config/src/NL_TYPES_H.cpp b/etc/config/src/NL_TYPES_H.cpp
index dd98b29..faae2f3 100644
--- a/etc/config/src/NL_TYPES_H.cpp
+++ b/etc/config/src/NL_TYPES_H.cpp
@@ -1,5 +1,27 @@
 // checking for catopen() in <nl_types.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <nl_types.h>
 #include "config.h"
 
diff --git a/etc/config/src/NONCLASS_ARROW_RETURN.cpp b/etc/config/src/NONCLASS_ARROW_RETURN.cpp
index bb6d647..d5dcf89 100644
--- a/etc/config/src/NONCLASS_ARROW_RETURN.cpp
+++ b/etc/config/src/NONCLASS_ARROW_RETURN.cpp
@@ -1,5 +1,27 @@
 // checking for operator->()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 struct A
 {
     int a;
diff --git a/etc/config/src/NONDEDUCED_CONTEXT.cpp b/etc/config/src/NONDEDUCED_CONTEXT.cpp
index 0b756fa..68c8d4f 100644
--- a/etc/config/src/NONDEDUCED_CONTEXT.cpp
+++ b/etc/config/src/NONDEDUCED_CONTEXT.cpp
@@ -1,5 +1,27 @@
 // checking nondeduced context
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_TYPENAME
diff --git a/etc/config/src/NO_DBL_TRAPS.cpp b/etc/config/src/NO_DBL_TRAPS.cpp
index 0dfd089..95e9b9b 100644
--- a/etc/config/src/NO_DBL_TRAPS.cpp
+++ b/etc/config/src/NO_DBL_TRAPS.cpp
@@ -1,5 +1,27 @@
 // checking if floating point math traps
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/NO_FOR_LOCAL_SCOPE.cpp b/etc/config/src/NO_FOR_LOCAL_SCOPE.cpp
index 9b1356b..d71b13d 100644
--- a/etc/config/src/NO_FOR_LOCAL_SCOPE.cpp
+++ b/etc/config/src/NO_FOR_LOCAL_SCOPE.cpp
@@ -1,5 +1,27 @@
 // checking for scope of for-init-statements
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 int foo (int n)
 {
     int result = 0;
diff --git a/etc/config/src/NO_INT_TRAPS.cpp b/etc/config/src/NO_INT_TRAPS.cpp
index 3025f64..0b9eb63 100644
--- a/etc/config/src/NO_INT_TRAPS.cpp
+++ b/etc/config/src/NO_INT_TRAPS.cpp
@@ -1,5 +1,27 @@
 // checking if integer math traps
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/NO_SIGNALING_NAN.cpp b/etc/config/src/NO_SIGNALING_NAN.cpp
index f0fbeda..854c740 100644
--- a/etc/config/src/NO_SIGNALING_NAN.cpp
+++ b/etc/config/src/NO_SIGNALING_NAN.cpp
@@ -1,5 +1,27 @@
 // checking for signaling NaN
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/etc/config/src/OFFSETOF.cpp b/etc/config/src/OFFSETOF.cpp
index c04f550..cfe8d35 100644
--- a/etc/config/src/OFFSETOF.cpp
+++ b/etc/config/src/OFFSETOF.cpp
@@ -1,5 +1,27 @@
 // checking for a working offsetof() in <stddef.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stddef.h>
 
 struct S
diff --git a/etc/config/src/OPERATOR_DELETE_ARRAY.cpp b/etc/config/src/OPERATOR_DELETE_ARRAY.cpp
index cad2508..dd73d56 100644
--- a/etc/config/src/OPERATOR_DELETE_ARRAY.cpp
+++ b/etc/config/src/OPERATOR_DELETE_ARRAY.cpp
@@ -1,5 +1,27 @@
 // checking for operator delete[] (void*)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/OPERATOR_DELETE_ARRAY_NOTHROW.cpp b/etc/config/src/OPERATOR_DELETE_ARRAY_NOTHROW.cpp
index 7e2fda4..a532d41 100644
--- a/etc/config/src/OPERATOR_DELETE_ARRAY_NOTHROW.cpp
+++ b/etc/config/src/OPERATOR_DELETE_ARRAY_NOTHROW.cpp
@@ -1,5 +1,27 @@
 // checking for operator delete[] (void*, nothrow_t)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 #include <stddef.h>
 
diff --git a/etc/config/src/OPERATOR_DELETE_ARRAY_PLACEMENT.cpp b/etc/config/src/OPERATOR_DELETE_ARRAY_PLACEMENT.cpp
index c2274c4..57e7112 100644
--- a/etc/config/src/OPERATOR_DELETE_ARRAY_PLACEMENT.cpp
+++ b/etc/config/src/OPERATOR_DELETE_ARRAY_PLACEMENT.cpp
@@ -1,5 +1,27 @@
 // checking for operator delete[] (void*, void*)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/OPERATOR_DELETE_NOTHROW.cpp b/etc/config/src/OPERATOR_DELETE_NOTHROW.cpp
index d533980..30a7f31 100644
--- a/etc/config/src/OPERATOR_DELETE_NOTHROW.cpp
+++ b/etc/config/src/OPERATOR_DELETE_NOTHROW.cpp
@@ -1,5 +1,27 @@
 // checking for operator delete (void*, nothrow_t)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 #include <stddef.h>
 
diff --git a/etc/config/src/OPERATOR_DELETE_PLACEMENT.cpp b/etc/config/src/OPERATOR_DELETE_PLACEMENT.cpp
index dc0b5b3..4b6b381 100644
--- a/etc/config/src/OPERATOR_DELETE_PLACEMENT.cpp
+++ b/etc/config/src/OPERATOR_DELETE_PLACEMENT.cpp
@@ -1,5 +1,27 @@
 // checking for operator delete (void*, void*)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/OPERATOR_NEW_ARRAY.cpp b/etc/config/src/OPERATOR_NEW_ARRAY.cpp
index a164c8f..566beb0 100644
--- a/etc/config/src/OPERATOR_NEW_ARRAY.cpp
+++ b/etc/config/src/OPERATOR_NEW_ARRAY.cpp
@@ -1,5 +1,27 @@
 // checking for operator new[] (size_t)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/OPERATOR_NEW_ARRAY_NOTHROW.cpp b/etc/config/src/OPERATOR_NEW_ARRAY_NOTHROW.cpp
index ef2bfc6..5343e8b 100644
--- a/etc/config/src/OPERATOR_NEW_ARRAY_NOTHROW.cpp
+++ b/etc/config/src/OPERATOR_NEW_ARRAY_NOTHROW.cpp
@@ -1,5 +1,27 @@
 // checking for operator new[] (size_t, nothrow_t)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/OPERATOR_NEW_ARRAY_PLACEMENT.cpp b/etc/config/src/OPERATOR_NEW_ARRAY_PLACEMENT.cpp
index b92b3b5..a3555e1 100644
--- a/etc/config/src/OPERATOR_NEW_ARRAY_PLACEMENT.cpp
+++ b/etc/config/src/OPERATOR_NEW_ARRAY_PLACEMENT.cpp
@@ -1,5 +1,27 @@
 // checking for operator new[] (size_t, void*)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/OPERATOR_NEW_NOTHROW.cpp b/etc/config/src/OPERATOR_NEW_NOTHROW.cpp
index 91e8842..c6cc57c 100644
--- a/etc/config/src/OPERATOR_NEW_NOTHROW.cpp
+++ b/etc/config/src/OPERATOR_NEW_NOTHROW.cpp
@@ -1,5 +1,27 @@
 // checking for operator new (size_t, nothrow_t)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 /*********************************************************************
  * This and related operator comptests are necessarily complicated
  * due to the possibility that the nothrow versions of the operators
diff --git a/etc/config/src/OPERATOR_NEW_PLACEMENT.cpp b/etc/config/src/OPERATOR_NEW_PLACEMENT.cpp
index de29985..32296b3 100644
--- a/etc/config/src/OPERATOR_NEW_PLACEMENT.cpp
+++ b/etc/config/src/OPERATOR_NEW_PLACEMENT.cpp
@@ -1,5 +1,27 @@
 // checking for operator new (size_t, void*)
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/OVERLOAD_OF_TEMPLATE_FUNCTION.cpp b/etc/config/src/OVERLOAD_OF_TEMPLATE_FUNCTION.cpp
index c148332..dca60bb 100644
--- a/etc/config/src/OVERLOAD_OF_TEMPLATE_FUNCTION.cpp
+++ b/etc/config/src/OVERLOAD_OF_TEMPLATE_FUNCTION.cpp
@@ -1,5 +1,27 @@
 // checking complicated partial ordering
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 template <class T, class U>
 class S { };
diff --git a/etc/config/src/PART_SPEC_OVERLOAD.cpp b/etc/config/src/PART_SPEC_OVERLOAD.cpp
index 107200a..d481050 100644
--- a/etc/config/src/PART_SPEC_OVERLOAD.cpp
+++ b/etc/config/src/PART_SPEC_OVERLOAD.cpp
@@ -1,5 +1,27 @@
 // checking partial ordering of function templates
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 struct S { };
 
diff --git a/etc/config/src/PLACEMENT_DELETE.cpp b/etc/config/src/PLACEMENT_DELETE.cpp
index 82f6d0e..e17770e 100644
--- a/etc/config/src/PLACEMENT_DELETE.cpp
+++ b/etc/config/src/PLACEMENT_DELETE.cpp
@@ -1,5 +1,27 @@
 // checking for placement delete
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_EXCEPTION_SPECIFICATION_ON_NEW
diff --git a/etc/config/src/POD_ZERO_INIT.cpp b/etc/config/src/POD_ZERO_INIT.cpp
index ad558a6..97ae631 100644
--- a/etc/config/src/POD_ZERO_INIT.cpp
+++ b/etc/config/src/POD_ZERO_INIT.cpp
@@ -1,5 +1,27 @@
 // checking for POD zero initialization
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_NEW
diff --git a/etc/config/src/PRETTY_FUNCTION.cpp b/etc/config/src/PRETTY_FUNCTION.cpp
index c37a637..7755a55 100644
--- a/etc/config/src/PRETTY_FUNCTION.cpp
+++ b/etc/config/src/PRETTY_FUNCTION.cpp
@@ -1,5 +1,27 @@
 // checking for __PRETTY_FUNCTION__
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 const char* foo ()
 {
     const char *func = __PRETTY_FUNCTION__;
diff --git a/etc/config/src/PTR_EXCEPTION_SPEC.cpp b/etc/config/src/PTR_EXCEPTION_SPEC.cpp
index f7c8845..6c68703 100644
--- a/etc/config/src/PTR_EXCEPTION_SPEC.cpp
+++ b/etc/config/src/PTR_EXCEPTION_SPEC.cpp
@@ -1,5 +1,27 @@
 // checking for pointer exception specification
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 struct S
 {
     void foo () throw () { }
diff --git a/etc/config/src/PUTENV_CONST_CHAR.cpp b/etc/config/src/PUTENV_CONST_CHAR.cpp
index 14a22b2..b83b284 100644
--- a/etc/config/src/PUTENV_CONST_CHAR.cpp
+++ b/etc/config/src/PUTENV_CONST_CHAR.cpp
@@ -1,5 +1,27 @@
 // checking for putenv() in <stdlib.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdlib.h>
 
 // [re]declare with the expected POSIX signature which will fail
diff --git a/etc/config/src/QUIET_NAN.cpp b/etc/config/src/QUIET_NAN.cpp
index 408da81..434fff4 100644
--- a/etc/config/src/QUIET_NAN.cpp
+++ b/etc/config/src/QUIET_NAN.cpp
@@ -1,5 +1,27 @@
 // checking for quiet NaN
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdlib.h>
 
 #include "config.h"
diff --git a/etc/config/src/REINTERPRET_CAST.cpp b/etc/config/src/REINTERPRET_CAST.cpp
index 46afd9d..afac1e2 100644
--- a/etc/config/src/REINTERPRET_CAST.cpp
+++ b/etc/config/src/REINTERPRET_CAST.cpp
@@ -1,5 +1,27 @@
 // checking for reinterpret_cast
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 int main ()
 {
diff --git a/etc/config/src/RUNTIME_IN_STD.cpp b/etc/config/src/RUNTIME_IN_STD.cpp
index a410424..c6aade2 100644
--- a/etc/config/src/RUNTIME_IN_STD.cpp
+++ b/etc/config/src/RUNTIME_IN_STD.cpp
@@ -1,5 +1,27 @@
 // checking for runtime support in namespace std
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stdio.h>
diff --git a/etc/config/src/SETLOCALE.cpp b/etc/config/src/SETLOCALE.cpp
index 642793f..41bf53d 100644
--- a/etc/config/src/SETLOCALE.cpp
+++ b/etc/config/src/SETLOCALE.cpp
@@ -1,5 +1,27 @@
 // checking for setlocale() in <locale.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <locale.h>
 
 #include "config.h"
diff --git a/etc/config/src/SETRLIMIT.cpp b/etc/config/src/SETRLIMIT.cpp
index 274d745..c612bea 100644
--- a/etc/config/src/SETRLIMIT.cpp
+++ b/etc/config/src/SETRLIMIT.cpp
@@ -1,5 +1,27 @@
 // checking for setrlimit() in <sys/resource.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <sys/resource.h>   // for setrlimit()
 
 void foo ()
diff --git a/etc/config/src/SIG_ATOMIC_T.cpp b/etc/config/src/SIG_ATOMIC_T.cpp
index c0c7858..380c506 100644
--- a/etc/config/src/SIG_ATOMIC_T.cpp
+++ b/etc/config/src/SIG_ATOMIC_T.cpp
@@ -1,5 +1,27 @@
 // checking for signal support in <signal.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <signal.h>
 #include <stdio.h>
 
diff --git a/etc/config/src/SIZE_T.cpp b/etc/config/src/SIZE_T.cpp
index 4addcab..797b1e1 100644
--- a/etc/config/src/SIZE_T.cpp
+++ b/etc/config/src/SIZE_T.cpp
@@ -1,5 +1,27 @@
 // checking for fpos_t, ptrdiff_t, and size_t
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>
diff --git a/etc/config/src/SPECIALIZATION_ON_RETURN_TYPE.cpp b/etc/config/src/SPECIALIZATION_ON_RETURN_TYPE.cpp
index bb9117e..7529c6d 100644
--- a/etc/config/src/SPECIALIZATION_ON_RETURN_TYPE.cpp
+++ b/etc/config/src/SPECIALIZATION_ON_RETURN_TYPE.cpp
@@ -1,5 +1,27 @@
 // checking for specialization on return type
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 template <class T>
 T foo () { return T (); }
diff --git a/etc/config/src/SPECIALIZED_FRIEND.cpp b/etc/config/src/SPECIALIZED_FRIEND.cpp
index b8bee82..ac3978c 100644
--- a/etc/config/src/SPECIALIZED_FRIEND.cpp
+++ b/etc/config/src/SPECIALIZED_FRIEND.cpp
@@ -1,5 +1,27 @@
 // checking template<> in friend specializations
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 struct S;
 
diff --git a/etc/config/src/STATICS_IN_TEMPLATE.cpp b/etc/config/src/STATICS_IN_TEMPLATE.cpp
index 04cf81b..60bd653 100644
--- a/etc/config/src/STATICS_IN_TEMPLATE.cpp
+++ b/etc/config/src/STATICS_IN_TEMPLATE.cpp
@@ -1,5 +1,27 @@
 // checking for references to static symbols in template
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 static int static_function (int i) { return i; }
 static int static_function (double d) { return int (d); }
 
diff --git a/etc/config/src/STATIC_CAST.cpp b/etc/config/src/STATIC_CAST.cpp
index 893020b..8166cc1 100644
--- a/etc/config/src/STATIC_CAST.cpp
+++ b/etc/config/src/STATIC_CAST.cpp
@@ -1,5 +1,27 @@
 // checking for static_cast
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 void foo (void *p, char *s, int i, double d)
 {
     p = static_cast<void*>(s);
diff --git a/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp b/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp
index 6d8f4c6..ba11fa8 100644
--- a/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp
+++ b/etc/config/src/STATIC_CONST_MEMBER_EXPR_CONST.cpp
@@ -1,5 +1,27 @@
 // checking for type-dependent constant expressions 
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_TYPENAME
diff --git a/etc/config/src/STATIC_CONST_MEMBER_INIT.cpp b/etc/config/src/STATIC_CONST_MEMBER_INIT.cpp
index 22ec37d..23f3020 100644
--- a/etc/config/src/STATIC_CONST_MEMBER_INIT.cpp
+++ b/etc/config/src/STATIC_CONST_MEMBER_INIT.cpp
@@ -1,5 +1,27 @@
 // checking for const member initializer
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 struct A
 {
     static const int i = 1;
diff --git a/etc/config/src/STATIC_TEMPLATE_MEMBER_INIT.cpp b/etc/config/src/STATIC_TEMPLATE_MEMBER_INIT.cpp
index c737719..169d124 100644
--- a/etc/config/src/STATIC_TEMPLATE_MEMBER_INIT.cpp
+++ b/etc/config/src/STATIC_TEMPLATE_MEMBER_INIT.cpp
@@ -1,5 +1,27 @@
 // checking initialization of static template data memebers
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 struct S
 {
diff --git a/etc/config/src/STD_BAD_ALLOC.cpp b/etc/config/src/STD_BAD_ALLOC.cpp
index f652c78..ea20b2c 100644
--- a/etc/config/src/STD_BAD_ALLOC.cpp
+++ b/etc/config/src/STD_BAD_ALLOC.cpp
@@ -1,5 +1,27 @@
 // checking for class std::bad_alloc
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if !defined (_RWSTD_NO_NEW_THROWS) && !defined (_RWSTD_NO_NEW_OFLOW_SAFE)
diff --git a/etc/config/src/STD_BAD_CAST.cpp b/etc/config/src/STD_BAD_CAST.cpp
index 9cd10fb..460fde1 100644
--- a/etc/config/src/STD_BAD_CAST.cpp
+++ b/etc/config/src/STD_BAD_CAST.cpp
@@ -1,5 +1,27 @@
 // checking for class std::bad_cast
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/STD_BAD_EXCEPTION.cpp b/etc/config/src/STD_BAD_EXCEPTION.cpp
index f51894b..2bd0ac0 100644
--- a/etc/config/src/STD_BAD_EXCEPTION.cpp
+++ b/etc/config/src/STD_BAD_EXCEPTION.cpp
@@ -1,5 +1,27 @@
 // checking for class std::bad_exception
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_HONOR_STD
diff --git a/etc/config/src/STD_BAD_TYPEID.cpp b/etc/config/src/STD_BAD_TYPEID.cpp
index ff73100..de7210b 100644
--- a/etc/config/src/STD_BAD_TYPEID.cpp
+++ b/etc/config/src/STD_BAD_TYPEID.cpp
@@ -1,5 +1,27 @@
 // checking for class std::bad_typeid
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_TYPEINFO
diff --git a/etc/config/src/STD_EXCEPTION.cpp b/etc/config/src/STD_EXCEPTION.cpp
index d8fd203..e212d60 100644
--- a/etc/config/src/STD_EXCEPTION.cpp
+++ b/etc/config/src/STD_EXCEPTION.cpp
@@ -1,5 +1,27 @@
 // checking for class std::exception
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_HONOR_STD
diff --git a/etc/config/src/STD_MBSTATE_T.cpp b/etc/config/src/STD_MBSTATE_T.cpp
index 37c9764..d930eab 100644
--- a/etc/config/src/STD_MBSTATE_T.cpp
+++ b/etc/config/src/STD_MBSTATE_T.cpp
@@ -1,5 +1,27 @@
 // checking for std::mbstate_t in <wchar.h> and <wctype.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_WCHAR_H
diff --git a/etc/config/src/STD_NOTHROW.cpp b/etc/config/src/STD_NOTHROW.cpp
index 3ef1ec2..e36aab4 100644
--- a/etc/config/src/STD_NOTHROW.cpp
+++ b/etc/config/src/STD_NOTHROW.cpp
@@ -1,5 +1,27 @@
 // checking for std::nothrow
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 // will fail if namespaces aren't supported
 namespace std {
diff --git a/etc/config/src/STD_NOTHROW_T.cpp b/etc/config/src/STD_NOTHROW_T.cpp
index 8d6fb8e..7013830 100644
--- a/etc/config/src/STD_NOTHROW_T.cpp
+++ b/etc/config/src/STD_NOTHROW_T.cpp
@@ -1,5 +1,27 @@
 // checking for std::nothrow_t
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stddef.h>   // for size_t
 
 #include "config.h"
diff --git a/etc/config/src/STD_SET_NEW_HANDLER.cpp b/etc/config/src/STD_SET_NEW_HANDLER.cpp
index 4794885..52fa10f 100644
--- a/etc/config/src/STD_SET_NEW_HANDLER.cpp
+++ b/etc/config/src/STD_SET_NEW_HANDLER.cpp
@@ -1,5 +1,27 @@
 // checking for std::set_new_handler()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_EXCEPTION_SPECIFICATION
diff --git a/etc/config/src/STD_SET_TERMINATE.cpp b/etc/config/src/STD_SET_TERMINATE.cpp
index 3093f15..15e9371 100644
--- a/etc/config/src/STD_SET_TERMINATE.cpp
+++ b/etc/config/src/STD_SET_TERMINATE.cpp
@@ -1,5 +1,27 @@
 // checking for std::set_terminate()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_EXCEPTION_SPECIFICATION
diff --git a/etc/config/src/STD_SET_UNEXPECTED.cpp b/etc/config/src/STD_SET_UNEXPECTED.cpp
index 4215027..e024094 100644
--- a/etc/config/src/STD_SET_UNEXPECTED.cpp
+++ b/etc/config/src/STD_SET_UNEXPECTED.cpp
@@ -1,5 +1,27 @@
 // checking for std::set_unexpected()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/STD_TERMINATE.cpp b/etc/config/src/STD_TERMINATE.cpp
index 14c409d..42bbee2 100644
--- a/etc/config/src/STD_TERMINATE.cpp
+++ b/etc/config/src/STD_TERMINATE.cpp
@@ -1,5 +1,27 @@
 // checking for std::terminate()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 // will fail if namespaces aren't supported
diff --git a/etc/config/src/STD_TYPE_INFO.cpp b/etc/config/src/STD_TYPE_INFO.cpp
index f6ad4d2..f5b0823 100644
--- a/etc/config/src/STD_TYPE_INFO.cpp
+++ b/etc/config/src/STD_TYPE_INFO.cpp
@@ -1,5 +1,27 @@
 // checking for class std::type_info
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 namespace std {
 
diff --git a/etc/config/src/STD_UNCAUGHT_EXCEPTION.cpp b/etc/config/src/STD_UNCAUGHT_EXCEPTION.cpp
index e6db624..e492305 100644
--- a/etc/config/src/STD_UNCAUGHT_EXCEPTION.cpp
+++ b/etc/config/src/STD_UNCAUGHT_EXCEPTION.cpp
@@ -1,5 +1,27 @@
 // checking for std::uncaught_exception()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/STD_UNEXPECTED.cpp b/etc/config/src/STD_UNEXPECTED.cpp
index 21b3356..5a3de87 100644
--- a/etc/config/src/STD_UNEXPECTED.cpp
+++ b/etc/config/src/STD_UNEXPECTED.cpp
@@ -1,5 +1,27 @@
 // checking for std::unexpected()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 // will fail if namespaces aren't supported
 namespace std {
diff --git a/etc/config/src/STRUCT_TM.cpp b/etc/config/src/STRUCT_TM.cpp
index 0d6b75b..7738d68 100644
--- a/etc/config/src/STRUCT_TM.cpp
+++ b/etc/config/src/STRUCT_TM.cpp
@@ -1,5 +1,27 @@
 // checking for struct tm in <time.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stddef.h>   // for offsetof, size_t
 #include <stdio.h>    // for printf
 #include <string.h>   // for strlen
diff --git a/etc/config/src/STRUCT_TM_IN_WCHAR_H.cpp b/etc/config/src/STRUCT_TM_IN_WCHAR_H.cpp
index 5d79ab0..f78802e 100644
--- a/etc/config/src/STRUCT_TM_IN_WCHAR_H.cpp
+++ b/etc/config/src/STRUCT_TM_IN_WCHAR_H.cpp
@@ -1,5 +1,27 @@
 // checking for struct tm declaration in <wchar.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <wchar.h>
 
 // 7.24.1, p2 of C99: struct tm is required to declared
diff --git a/etc/config/src/TEMPLATE_DEFAULT_ARG_CONVERSION.cpp b/etc/config/src/TEMPLATE_DEFAULT_ARG_CONVERSION.cpp
index 680216a..dc4c236 100644
--- a/etc/config/src/TEMPLATE_DEFAULT_ARG_CONVERSION.cpp
+++ b/etc/config/src/TEMPLATE_DEFAULT_ARG_CONVERSION.cpp
@@ -1,5 +1,27 @@
 // checking for conversion in template default arguments
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 template <class T>
 struct A { };
diff --git a/etc/config/src/TEMPLATE_ON_RETURN_TYPE.cpp b/etc/config/src/TEMPLATE_ON_RETURN_TYPE.cpp
index 602afb0..c1a20af 100644
--- a/etc/config/src/TEMPLATE_ON_RETURN_TYPE.cpp
+++ b/etc/config/src/TEMPLATE_ON_RETURN_TYPE.cpp
@@ -1,5 +1,27 @@
 // checking template overloads on return type
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 
 template <class T>
 struct A { char dummy [8]; };
diff --git a/etc/config/src/THREAD_SAFE_ERRNO.cpp b/etc/config/src/THREAD_SAFE_ERRNO.cpp
index 4b7f318..1fbb022 100644
--- a/etc/config/src/THREAD_SAFE_ERRNO.cpp
+++ b/etc/config/src/THREAD_SAFE_ERRNO.cpp
@@ -1,5 +1,27 @@
 // checking if errno is thread safe
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <errno.h>
 #include "thread.h"
 
diff --git a/etc/config/src/THREAD_SAFE_EXCEPTIONS.cpp b/etc/config/src/THREAD_SAFE_EXCEPTIONS.cpp
index 58d7582..111682e 100644
--- a/etc/config/src/THREAD_SAFE_EXCEPTIONS.cpp
+++ b/etc/config/src/THREAD_SAFE_EXCEPTIONS.cpp
@@ -1,5 +1,27 @@
 // checking if exceptions are thread safe
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "thread.h"
 
 
diff --git a/etc/config/src/THREAD_SAFE_LOCALE.cpp b/etc/config/src/THREAD_SAFE_LOCALE.cpp
index b6b87ed..1d4d16d 100644
--- a/etc/config/src/THREAD_SAFE_LOCALE.cpp
+++ b/etc/config/src/THREAD_SAFE_LOCALE.cpp
@@ -1,5 +1,27 @@
 // checking if locale is thread safe
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // determines whether each thread has its own C locale environment
 // that's independent of those of all other threads or whether the
 // C locale facility is process global (i.e., shared among all
diff --git a/etc/config/src/TIMEZONE.cpp b/etc/config/src/TIMEZONE.cpp
index f1fa7bd..50d8ac4 100644
--- a/etc/config/src/TIMEZONE.cpp
+++ b/etc/config/src/TIMEZONE.cpp
@@ -1,5 +1,27 @@
 // checking for int timezone in <time.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <time.h>
 
 int get_timezone_value ()
diff --git a/etc/config/src/TLS.cpp b/etc/config/src/TLS.cpp
index 2134ff6..b0bd55d 100644
--- a/etc/config/src/TLS.cpp
+++ b/etc/config/src/TLS.cpp
@@ -1,5 +1,27 @@
 // checking for thread-local storage
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdio.h>
 
 #if defined (_MSC_VER)
diff --git a/etc/config/src/TYPENAME.cpp b/etc/config/src/TYPENAME.cpp
index 40ecd9c..665a2ad 100644
--- a/etc/config/src/TYPENAME.cpp
+++ b/etc/config/src/TYPENAME.cpp
@@ -1,5 +1,26 @@
 // checking the typename keyword
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
 
 struct A
 {
diff --git a/etc/config/src/TYPE_INFO_BEFORE.cpp b/etc/config/src/TYPE_INFO_BEFORE.cpp
index 9b33b0a..da4f4ae 100644
--- a/etc/config/src/TYPE_INFO_BEFORE.cpp
+++ b/etc/config/src/TYPE_INFO_BEFORE.cpp
@@ -1,5 +1,27 @@
 // checking for type_info::before()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/TYPE_INFO_DTOR.cpp b/etc/config/src/TYPE_INFO_DTOR.cpp
index 514bdc3..a3254aa 100644
--- a/etc/config/src/TYPE_INFO_DTOR.cpp
+++ b/etc/config/src/TYPE_INFO_DTOR.cpp
@@ -1,5 +1,27 @@
 // checking for type_info dtor
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/TYPE_INFO_EQUALITY.cpp b/etc/config/src/TYPE_INFO_EQUALITY.cpp
index ec64398..1617c74 100644
--- a/etc/config/src/TYPE_INFO_EQUALITY.cpp
+++ b/etc/config/src/TYPE_INFO_EQUALITY.cpp
@@ -1,5 +1,27 @@
 // checking for type_info::operator==()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/TYPE_INFO_INEQUALITY.cpp b/etc/config/src/TYPE_INFO_INEQUALITY.cpp
index a5bb35f..6020ca0 100644
--- a/etc/config/src/TYPE_INFO_INEQUALITY.cpp
+++ b/etc/config/src/TYPE_INFO_INEQUALITY.cpp
@@ -1,5 +1,27 @@
 // checking for type_info::operator!=()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/TYPE_INFO_NAME.cpp b/etc/config/src/TYPE_INFO_NAME.cpp
index 29f4344..2562f7f 100644
--- a/etc/config/src/TYPE_INFO_NAME.cpp
+++ b/etc/config/src/TYPE_INFO_NAME.cpp
@@ -1,5 +1,27 @@
 // checking for type_info::name()
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 
diff --git a/etc/config/src/UNAME.cpp b/etc/config/src/UNAME.cpp
index 2e00836..ebaac53 100644
--- a/etc/config/src/UNAME.cpp
+++ b/etc/config/src/UNAME.cpp
@@ -1,5 +1,27 @@
 // determining OS name and version
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdio.h>
 
 #if !defined (_WIN32) && !defined (_WIN64)
@@ -9,14 +31,35 @@
 #endif
 
 
-int compare (const char *a, const char *b)
+static int print_os_version ();
+
+
+int main ()
+{
+    return print_os_version ();
+}
+
+////////////////////////////////////////////////////////////////////////
+
+static unsigned length (const char *s)
+{
+    unsigned len = 0;
+
+    while (*s++)
+        ++len;
+
+    return len;
+}
+
+
+static int compare (const char *a, const char *b)
 {
     for (; *a && *a == *b; ++a, ++b);
     return *a - *b;
 }
 
 
-char* capitalize (char *str)
+static char* capitalize (char *str)
 {
     static const char upper[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
     static const char lower[] = "abcdefghijklmnopqrstuvwxyz0123456789";
@@ -43,16 +86,80 @@
 }
 
 
+
 #define ISDIGIT(x)   ((x) >= '0' && (x) <= '9')
 
-int main ()
-{
-#if !defined (_WIN32) && !defined (_WIN64)
 
+#ifndef _WIN32
+
+
+static void print_linux_release ()
+{
+    static const char* const files[] = {
+        // Debian
+ 	"/etc/debian_release",   // see also /etc/debian_version?
+        // Fedora
+ 	"/etc/fedora-release",
+        // Gentoo
+ 	"/etc/gentoo-release",
+        // Novell SUSE
+  	"/etc/SuSE-release",
+        // Red Hat
+ 	"/etc/redhat-release",   // see also /etc/redhat_version?
+        // Slackware
+ 	"/etc/slackware-release",   // see also /etc/slackware-version?
+        // Mandrake
+ 	"/etc/mandrake-release",
+        // Mandriva
+        "/etc/mandriva-release",
+        // MEPIS Linux
+        "/etc/mepis-release",
+        // Sun JDS
+ 	"/etc/sun-release",
+        // Solaris/SPARC
+ 	"/etc/release",
+        // Turbo Linux
+        "/etc/turbolinux-release",
+        // UnitedLinux
+ 	"/etc/UnitedLinux-release",
+        // Ubuntu
+ 	"/etc/lsb-release",
+        // Yellow Dog
+ 	"/etc/yellowdog-release",
+
+        ////////////////////////////////////////////////////
+        // Last entry must be 0
+        0
+    };
+
+    FILE *fp = 0;
+
+    for (unsigned i = 0; files [i]; ++i) {
+        fp = fopen (files [i], "r");
+        if (fp)
+            break;
+    }
+
+
+    char buffer [1024] = "(unknown release)";
+
+    if (fp) {
+        char *s = fgets (buffer, int (sizeof buffer), fp);
+        if (s)
+            buffer [length (s) - 1] = '\0';
+
+    }
+
+    printf ("#define _RWSTD_LINUX_RELEASE \"%s\"\n", buffer);
+}
+
+
+static int print_os_version ()
+{
     struct utsname uts;
 
     if (0 > uname (&uts))
-        return 0;
+        return 1;
 
     printf ("#define _RWSTD_OS_%s\n", capitalize (uts.sysname));
 
@@ -99,8 +206,21 @@
 
     printf ("#define _RWSTD_OS_MICRO %lu\n", num);
 
-#else   // if defined (_WIN{32,64})
+    if (0 == compare ("LINUX", uts.sysname)) {
 
+        // determine Linux distribution
+        print_linux_release ();
+    }
+
+    return 0;
+}
+
+
+#else   // if defined (_WIN32)
+
+
+static int print_os_version ()
+{
     OSVERSIONINFO osinfo;
     osinfo.dwOSVersionInfoSize = sizeof osinfo;
 
@@ -110,7 +230,7 @@
     printf ("#define _RWSTD_OS_SYSNAME \"WINDOWS\"\n");
 
     if (!success)
-        return 0;
+        return 1;
 
     printf ("#define _RWSTD_OS_MAJOR %lu\n", osinfo.dwMajorVersion);
     printf ("#define _RWSTD_OS_MINOR %lu\n", osinfo.dwMinorVersion);
@@ -150,7 +270,7 @@
 
     printf ("#define _RWSTD_OS_VERSION \"%s\"\n", osinfo.szCSDVersion);
 
-#endif   // _WIN{32,64}
-
     return 0;
 }
+
+#endif   // _WIN32
diff --git a/etc/config/src/UNISTD_DECL.cpp b/etc/config/src/UNISTD_DECL.cpp
index 731d6a6..96d57b5 100644
--- a/etc/config/src/UNISTD_DECL.cpp
+++ b/etc/config/src/UNISTD_DECL.cpp
@@ -1,5 +1,27 @@
 // checking the contents of <unistd.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <sys/types.h>
diff --git a/etc/config/src/VA_LIST.cpp b/etc/config/src/VA_LIST.cpp
index ae349e1..b8e9a77 100644
--- a/etc/config/src/VA_LIST.cpp
+++ b/etc/config/src/VA_LIST.cpp
@@ -1,5 +1,27 @@
 // checking the type of va_list
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stdarg.h>
diff --git a/etc/config/src/VSNPRINTF_RETURN.cpp b/etc/config/src/VSNPRINTF_RETURN.cpp
index db78635..43e4961 100644
--- a/etc/config/src/VSNPRINTF_RETURN.cpp
+++ b/etc/config/src/VSNPRINTF_RETURN.cpp
@@ -1,5 +1,27 @@
 // checking vsnprintf() return value
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <stdarg.h>
 #include <stdio.h>
 
diff --git a/etc/config/src/WCHAR_T.cpp b/etc/config/src/WCHAR_T.cpp
index 97ec9eb..a635293 100644
--- a/etc/config/src/WCHAR_T.cpp
+++ b/etc/config/src/WCHAR_T.cpp
@@ -1,5 +1,27 @@
 // checking for wchar_t support
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_WCHAR_H
diff --git a/etc/config/src/WCSFTIME_WCHAR_T_FMAT.cpp b/etc/config/src/WCSFTIME_WCHAR_T_FMAT.cpp
index 0d90bc8..70f8d09 100644
--- a/etc/config/src/WCSFTIME_WCHAR_T_FMAT.cpp
+++ b/etc/config/src/WCSFTIME_WCHAR_T_FMAT.cpp
@@ -1,5 +1,27 @@
 // checking for wcsftime() in <wchar.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #include <stddef.h>   // for size_t
diff --git a/etc/config/src/WCTRANS_T.cpp b/etc/config/src/WCTRANS_T.cpp
index 5e5508d..2062d2b 100644
--- a/etc/config/src/WCTRANS_T.cpp
+++ b/etc/config/src/WCTRANS_T.cpp
@@ -1,5 +1,27 @@
 // checking for wctrans_t in <wchar.h> and <wctype.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_WCHAR_H
diff --git a/etc/config/src/WCTYPE_T.cpp b/etc/config/src/WCTYPE_T.cpp
index ffad743..d6afe96 100644
--- a/etc/config/src/WCTYPE_T.cpp
+++ b/etc/config/src/WCTYPE_T.cpp
@@ -1,5 +1,27 @@
 // checking for wctype_t in <wchar.h> and <wctype.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_WCHAR_H
diff --git a/etc/config/src/WINT_T.cpp b/etc/config/src/WINT_T.cpp
index f1354a1..1053768 100644
--- a/etc/config/src/WINT_T.cpp
+++ b/etc/config/src/WINT_T.cpp
@@ -1,5 +1,27 @@
 // checking for wint_t in <wchar.h> and <wctype.h>
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifndef _RWSTD_NO_WCHAR_H
diff --git a/etc/config/src/collapse_static_locals.lib.cpp b/etc/config/src/collapse_static_locals.lib.cpp
index 6dddba7..b88a01f 100644
--- a/etc/config/src/collapse_static_locals.lib.cpp
+++ b/etc/config/src/collapse_static_locals.lib.cpp
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // also defined in COLLAPSE_STATIC_LOCALS.cpp
 inline int foo ()
 {
diff --git a/etc/config/src/collapse_template_locals.lib.cpp b/etc/config/src/collapse_template_locals.lib.cpp
index 4859360..6c0e08b 100644
--- a/etc/config/src/collapse_template_locals.lib.cpp
+++ b/etc/config/src/collapse_template_locals.lib.cpp
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // also defined in COLLAPSE_TEMPLATE_STATICS.cpp
 template <class T>
 T foo (T)
diff --git a/etc/config/src/collapse_template_statics.lib.cpp b/etc/config/src/collapse_template_statics.lib.cpp
index 9b7e5ebb..cd14bd6 100644
--- a/etc/config/src/collapse_template_statics.lib.cpp
+++ b/etc/config/src/collapse_template_statics.lib.cpp
@@ -1,4 +1,26 @@
 
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
 // also defined in COLLAPSE_TEMPLATE_STATICS.cpp
 template <class T>
 struct S
diff --git a/etc/config/src/extern_function_template_imp.cpp b/etc/config/src/extern_function_template_imp.cpp
index 6316ebb..f8febe1 100644
--- a/etc/config/src/extern_function_template_imp.cpp
+++ b/etc/config/src/extern_function_template_imp.cpp
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 struct S
 {
diff --git a/etc/config/src/extern_inline.lib.cpp b/etc/config/src/extern_inline.lib.cpp
index 21dd856..592f9ca 100644
--- a/etc/config/src/extern_inline.lib.cpp
+++ b/etc/config/src/extern_inline.lib.cpp
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #if defined (_WIN32) && defined (_DLL)
 __declspec (dllexport)
 #endif  // _WIN32 && _DLL
diff --git a/etc/config/src/extern_template_before_definition_imp.cpp b/etc/config/src/extern_template_before_definition_imp.cpp
index 3c95aa5..0275c03 100644
--- a/etc/config/src/extern_template_before_definition_imp.cpp
+++ b/etc/config/src/extern_template_before_definition_imp.cpp
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #ifdef _RWSTD_NO_IMPLICIT_INCLUSION
diff --git a/etc/config/src/extern_template_imp.cpp b/etc/config/src/extern_template_imp.cpp
index c30006b..d37ab12 100644
--- a/etc/config/src/extern_template_imp.cpp
+++ b/etc/config/src/extern_template_imp.cpp
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include <config.h>
 
 // establish dependencies on the config tests and define config
diff --git a/etc/config/src/extern_template_imp.h b/etc/config/src/extern_template_imp.h
index 6fa7283..4d6eae4 100644
--- a/etc/config/src/extern_template_imp.h
+++ b/etc/config/src/extern_template_imp.h
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 // avoid including <config.h> here to avoid inadvertently
 // trying to introduce dependencies on other config tests
 // that the config infrastructure won't know about (since
diff --git a/etc/config/src/headers.inc b/etc/config/src/headers.inc
index ebbcea7..034e686 100644
--- a/etc/config/src/headers.inc
+++ b/etc/config/src/headers.inc
@@ -1,3 +1,25 @@
+##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 2001-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
+
 # list of headers
 hdrs="assert ctype errno float iso646 limits locale math setjmp signal       \
       stdarg stddef stdio stdlib string time wchar wctype new typeinfo"
diff --git a/etc/config/src/implicit_inclusion_imp.c b/etc/config/src/implicit_inclusion_imp.c
index 8e9ba56..b16f87f 100644
--- a/etc/config/src/implicit_inclusion_imp.c
+++ b/etc/config/src/implicit_inclusion_imp.c
@@ -1 +1,24 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "implicit_inclusion_imp.cc"
diff --git a/etc/config/src/implicit_inclusion_imp.cc b/etc/config/src/implicit_inclusion_imp.cc
index 68fcc35..2644145 100644
--- a/etc/config/src/implicit_inclusion_imp.cc
+++ b/etc/config/src/implicit_inclusion_imp.cc
@@ -1,6 +1,27 @@
-
 // definitions of out-of-line members declared in implicit_inclusion_imp.h
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 T S<T>::foo ()
 {
diff --git a/etc/config/src/implicit_inclusion_imp.h b/etc/config/src/implicit_inclusion_imp.h
index d6290f5..c39e189 100644
--- a/etc/config/src/implicit_inclusion_imp.h
+++ b/etc/config/src/implicit_inclusion_imp.h
@@ -1,3 +1,26 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 struct S
 {
diff --git a/etc/config/src/instantiation_before_definition.c b/etc/config/src/instantiation_before_definition.c
index 3c56763..dcf6a86 100644
--- a/etc/config/src/instantiation_before_definition.c
+++ b/etc/config/src/instantiation_before_definition.c
@@ -1,3 +1,25 @@
 // implementation file for instantiation_before_definition.h#
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "instantiation_before_definition.cc"
diff --git a/etc/config/src/instantiation_before_definition.cc b/etc/config/src/instantiation_before_definition.cc
index b25a035..ff2c735 100644
--- a/etc/config/src/instantiation_before_definition.cc
+++ b/etc/config/src/instantiation_before_definition.cc
@@ -1,5 +1,27 @@
 // implementation file for instantiation_before_definition.h
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 T instantiated_before_defined (T t)
 {
diff --git a/etc/config/src/instantiation_before_definition.h b/etc/config/src/instantiation_before_definition.h
index ca8eb1d..a0fe497 100644
--- a/etc/config/src/instantiation_before_definition.h
+++ b/etc/config/src/instantiation_before_definition.h
@@ -1,3 +1,26 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #ifndef INSTANTIATION_BEFORE_DEFINITION_INCLUDED
 #define INSTANTIATION_BEFORE_DEFINITION_INCLUDED
 
diff --git a/etc/config/src/instantiation_with_implicit_inclusion.c b/etc/config/src/instantiation_with_implicit_inclusion.c
index 2c16f95..324fc21 100644
--- a/etc/config/src/instantiation_with_implicit_inclusion.c
+++ b/etc/config/src/instantiation_with_implicit_inclusion.c
@@ -1 +1,24 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "instantiation_with_implicit_inclusion.cc"
diff --git a/etc/config/src/instantiation_with_implicit_inclusion.cc b/etc/config/src/instantiation_with_implicit_inclusion.cc
index 65e299f..94b848f 100644
--- a/etc/config/src/instantiation_with_implicit_inclusion.cc
+++ b/etc/config/src/instantiation_with_implicit_inclusion.cc
@@ -1,3 +1,26 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 T S<T>::bar (T t) { return t; }
 
diff --git a/etc/config/src/instantiation_with_implicit_inclusion.h b/etc/config/src/instantiation_with_implicit_inclusion.h
index 82d3ae1..812261c 100644
--- a/etc/config/src/instantiation_with_implicit_inclusion.h
+++ b/etc/config/src/instantiation_with_implicit_inclusion.h
@@ -1,3 +1,26 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 template <class T>
 struct S
 {
diff --git a/etc/config/src/lib_exceptions.lib.cpp b/etc/config/src/lib_exceptions.lib.cpp
index 3498218..955d951 100644
--- a/etc/config/src/lib_exceptions.lib.cpp
+++ b/etc/config/src/lib_exceptions.lib.cpp
@@ -1,4 +1,26 @@
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #include "config.h"
 
 #if defined (_WIN32) && defined (_DLL)
diff --git a/etc/config/src/locale_names.h b/etc/config/src/locale_names.h
index 9236f00..4cff73c 100644
--- a/etc/config/src/locale_names.h
+++ b/etc/config/src/locale_names.h
@@ -1,3 +1,25 @@
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #ifndef LOCALE_NAMES_H_INCLUDED
 #define LOCALE_NAMES_H_INCLUDED
 
diff --git a/etc/config/src/proclimits.h b/etc/config/src/proclimits.h
index 784caba..0f66214 100644
--- a/etc/config/src/proclimits.h
+++ b/etc/config/src/proclimits.h
@@ -1,6 +1,28 @@
 // proclimits.h must be included in .cpp file
 // only after #if[n]def _RWSTD_NO_SETRLIMIT line
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #if !defined (_RWSTD_NO_SETRLIMIT)
 
 #  include <sys/resource.h>   // for setrlimit()
diff --git a/etc/config/src/thread.h b/etc/config/src/thread.h
index bab09f6..3e3c706 100644
--- a/etc/config/src/thread.h
+++ b/etc/config/src/thread.h
@@ -1,3 +1,26 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #if defined (_WIN32)
 
 // definitions of Win32 POSIX compatibility layer functions
diff --git a/etc/config/src/types.h b/etc/config/src/types.h
index fc23e70..d1ce05a 100644
--- a/etc/config/src/types.h
+++ b/etc/config/src/types.h
@@ -1,5 +1,27 @@
 // definitions of the type_name() helper overloads
 
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #define STRSTR(symbol)   #symbol
 #define STR(symbol)      STRSTR (symbol)
 #define DEFINE_TYPE_HELPER(T, symbol)                   \
diff --git a/etc/config/sunpro.config b/etc/config/sunpro.config
index ffa4edd..11d19f7 100644
--- a/etc/config/sunpro.config
+++ b/etc/config/sunpro.config
@@ -4,14 +4,34 @@
 #
 # configuration file for SunPro CC on SunOS
 #
-##############################################################################
+########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+########################################################################
 
 CXX             = CC
 
 # extract the "C++ m.n" substring from version string (whcih changes
 # from one release of the compiler to another)
 CCVER          := $(shell   $(CXX) -V 2>&1 | head -n1 \
-                          | sed 's/.*C\+\+ *\([^ ]*\).*/\1/')
+                          | sed 's/.*C++ *\([^ ]*\).*/\1/')
 CCMAJOR        := $(shell echo $(CCVER) | cut -f1 -d'.')
 CCMINOR        := $(shell echo $(CCVER) | cut -f2 -d'.')
 
@@ -28,6 +48,15 @@
 endif
 
 WARNFLAGS       = +w
+
+ifeq ($(shell expr    \( $(CCMAJOR) = 5 \& $(CCMINOR) \> 6 \) \
+                   \| $(CCMAJOR) \> 5),1)
+  # for Sun C++ 5.7 and beyond, enable diagnostic "tags" in compiler output
+  # and use -erroff to silence Warning: std::stringstream::rdbuf hides the
+  # function std::ios::rdbuf(std::streambuf*) (see STDCXX-344)
+  WARNFLAGS += -errtags -erroff=hidef
+endif
+
 PICFLAGS        = -KPIC
 LDSOFLAGS       = 
 CXXFLAGS        = -library=%none
diff --git a/etc/config/vacpp.config b/etc/config/vacpp.config
index 9ac3c37..8e4cd76 100644
--- a/etc/config/vacpp.config
+++ b/etc/config/vacpp.config
@@ -5,6 +5,26 @@
 # configuration file for IBM VisualAge and XLC++
 #
 ##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
 
 # see if the xlCcore command exists and use it in preference to xlC
 # xlCcore, available in VAC++ 6.0 patches released since 4/2004, and
diff --git a/etc/config/windows/build.wsf b/etc/config/windows/build.wsf
index 17c76d5..0977ad6 100644
--- a/etc/config/windows/build.wsf
+++ b/etc/config/windows/build.wsf
@@ -28,6 +28,8 @@
                 name="CONFIG" required="true" type="string"/>
             <named helpstring="Output directory for modules" 
                 name="BUILDDIR" required="true" type="string"/>
+            <named helpstring="Top directory of stdcxx sources tree" 
+                name="TOPDIR" required="false" type="string"/>
             <named helpstring="Name of the solution configuration" 
                 name="BUILDTYPE" required="true" type="string"/>
             <named helpstring="Build projects only, do not execute tests" 
@@ -35,10 +37,12 @@
             <example>cscript build.wsf /CONFIG:msvc-7.1 /BUILDTYPE:11d
             </example>
             <usage>
-Usage: cscript build.wsf /CONFIG:@CONFIG /BUILDDIR:@BUILDDIR /BUILDTYPE:@BUILDTYPE [/BUILDONLY:@BUILDONLY]
+Usage: cscript build.wsf /CONFIG:@CONFIG /BUILDDIR:@BUILDDIR
+/TOPDIR:@TOPDIR /BUILDTYPE:@BUILDTYPE [/BUILDONLY:@BUILDONLY]
 where
 @CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc).
 @BUILDDIR is the root of the build directory.
+@TOPDIR is the root of the stdcxx source tree.
 @BUILDTYPE is the build type (11d, 11s, etc).
 @BUILDONLY is one of { yes, no } - execute or not the tests.
             </usage>
@@ -61,10 +65,15 @@
 // constants
 var currentCfg = "";
 var slnDir = "";
+var srcDir = "";
 var buildType = "";
 var longConfName = "";
 var buildOnly = false;
 var outputPane = null;
+var winconfigDir = "\\etc\\config\\windows";
+var postBuildInvoked;
+var rxBuildDir = null;
+var rxTopDir = null;
 
 var description = new build; // run
 
@@ -106,8 +115,37 @@
     return log;
 }
 
+function removeLogClutter(log)
+{
+    if ("" != slnDir)
+    {
+        if (null == rxBuildDir)
+        {
+            var buildDir = slnDir.replace(/\\/g, "\\\\");
+            rxBuildDir = new RegExp("(" + buildDir + ")", "ig");
+        }
+        log = log.replace(rxBuildDir, "$(BUILDDIR)");
+    }
+
+    if ("" != srcDir)
+    {
+        if (null == rxTopDir)
+        {
+            var topDir = srcDir.replace(/\\/g, "\\\\");
+            rxTopDir = new RegExp("(" + topDir + ")", "ig");
+        }
+        log = log.replace(rxTopDir, "$(TOPDIR)");
+    }
+
+    log = log.replace(/^Build log was saved at.*$/gm, "");
+
+    return log;
+}
+
 function event_ProjectBuildFinished(Cfg, Warnings, Errors, Canceled)
 {
+    postBuildInvoked = true;
+
     var log = "";
     var htm = "BuildLog.htm";
 
@@ -132,49 +170,53 @@
         sel.SelectAll();
         log = sel.Text;
 
-        // find BuildLoh.htm path
-        var proto = "file://";
-        var begin = log.indexOf(proto);
-        if (0 <= begin)
+        var log2 = "";
+        var begin = 0;
+
+        while (true)
         {
+            // find BuildLog.htm path
+            var proto = "file://";
+            begin = log.indexOf(proto, begin);
+            if (0 > begin)
+                break;
+
             begin += proto.length;
             var end = log.indexOf(htm, begin);
-            if (0 <= end)
-            {
-                var path = log.substring(begin, end + htm.length);
-                var log2 = getBuildLog(path);
-                if (0 < log2.length)
-                    log = log2;
-            }
+            if (0 > end)
+                break;
+
+            var path = log.substring(begin, end + htm.length);
+            log2 += getBuildLog(path);
         }
+
+        if (0 < log2.length)
+            log = log2;
     }
 
-    WScript.Echo(log);
+    WScript.Echo(removeLogClutter(log));
 }
 
 function BuildProject(solutionBuild, projectName)
 {
-    var projectFile = null;
+    var projectFile = "";
     var projects = dte.Solution.Projects;
-    for (var i = 1; i <= projects.Count && null == projectFile; ++i)
+    for (var i = 1; i <= projects.Count && 0 == projectFile.length; ++i)
     {
         var project = projects.Item(i);
         if (project.Name == projectName)
             projectFile = project.UniqueName;
     }
 
-    if (null != projectFile)
+    if (0 < projectFile.length)
     {
-        var isICC = 0 < projectFile.indexOf(".icproj");
+        event_ProjectBuildStarted(null);
 
-        if (isICC)
-            // event not invoked automatically for Intel projects
-            event_ProjectBuildStarted(null);
+        postBuildInvoked = false;
 
         solutionBuild.BuildProject(longConfName, projectFile, true);
 
-        if (isICC)
-            // event not invoked automatically for Intel projects
+        if (!postBuildInvoked)
             event_ProjectBuildFinished(null, 0, 0, 0);
 
         return solutionBuild.LastBuildInfo;
@@ -197,7 +239,7 @@
     
     dte.SuppressUI = true;
     
-    var solutionName = slnDir + "\\" + currentCfg + "\\" + currentCfg + ".sln";
+    var solutionName = slnDir + "\\" + currentCfg + ".sln";
 
     WScript.Echo("Loading solution...");
     var solution = dte.Solution;
@@ -206,6 +248,9 @@
     var prop = null;
     var propVal;
     var oldLogging = null;
+    var iSettings = null;
+    var oldIccIdx = null;
+    var oldPlatIdx = null;
     var projectEngine = null;
     var events = null;
 
@@ -280,6 +325,69 @@
             prop = null;
         }
 
+        if ("" != ICCVER)
+        {
+            // select proper Intel C++ compiler
+            try
+            {
+                iSettings = dte.GetObject("IntelOptions");
+            }
+            catch (e)
+            {
+                WScript.StdErr.WriteLine(
+                    "Build: Intel C++ not installed or installed incorrectly.");
+                retCode = 1;
+                break;
+            }
+
+            oldIccIdx = iSettings.CurrentCompilerIndex;
+            oldPlatIdx = iSettings.CurrentPlatformIndex;
+            WScript.Echo("Current compiler: " +
+                         iSettings.Compiler(oldIccIdx).Name);
+
+            var ICPlatform = "IA32";
+            if ("x64" == PLATFORM)
+                ICPlatform = "EM64T";
+
+            for (var i = 0; i < iSettings.PlatformsCount; ++i)
+            {
+                iSettings.CurrentPlatformIndex = i;
+                if (ICPlatform == iSettings.CurrentPlatformName)
+                    break;
+            }
+
+            if (i >= iSettings.PlatformsCount)
+            {
+                WScript.StdErr.WriteLine(
+                    "Build: Installed ICC does not support " + PLATFORM + " platform.");
+                retCode = 1;
+                break;
+            }
+
+            var rx = new RegExp("(^.*C\\+\\+ " + ICCVER + ".*)");
+
+            for (var i = 1; i <= iSettings.CompilersCount; ++i)
+            {
+                var compname = iSettings.Compiler(i).Name;
+                if (null != rx.exec(compname))
+                    break;
+            }
+
+            if (i <= iSettings.CompilersCount)
+            {
+                iSettings.CurrentCompilerIndex = i;
+                WScript.Echo("Selected compiler: " +
+                             iSettings.Compiler(i).Name);
+            }
+            else
+            {
+                WScript.StdErr.WriteLine(
+                    "Build: ICC " + ICCVER + " not found.");
+                retCode = 1;
+                break;
+            }
+        }
+
         // save BuildLogging property value
         oldLogging = projectEngine.BuildLogging;
         projectEngine.BuildLogging = true;
@@ -346,6 +454,16 @@
     }
     while (false);
 
+    if (null != iSettings)
+    {
+        if (null != oldIccIdx)
+            iSettings.CurrentCompilerIndex = oldIccIdx;
+        if (null != oldPlatIdx)
+            iSettings.CurrentPlatformIndex = oldPlatIdx;
+
+        iSettings = null;
+    }
+
     if (null != oldLogging)
         projectEngine.BuildLogging = oldLogging;
 
@@ -400,7 +518,22 @@
     currentCfg = WScript.Arguments.Named("CONFIG");
     
     slnDir = WScript.Arguments.Named("BUILDDIR");
-    slnDir = fso.GetAbsolutePathName (slnDir);
+    slnDir = fso.GetAbsolutePathName (slnDir) + "\\" + currentCfg;
+
+    if (WScript.Arguments.Named.Exists("TOPDIR"))
+    {
+        srcDir = WScript.Arguments.Named("TOPDIR");
+    }
+    else
+    {
+        // try to deduce it
+        var myDir = WScript.ScriptFullName;
+        var dirIndex = myDir.indexOf(winconfigDir);
+        if (0 <= dirIndex)
+            srcDir = myDir.substr(0, dirIndex);
+        else
+            srcDir = "";
+    }
 
     buildType = WScript.Arguments.Named("BUILDTYPE");
     
diff --git a/etc/config/windows/configure.wsf b/etc/config/windows/configure.wsf
index f34707c..de2bdf3 100644
--- a/etc/config/windows/configure.wsf
+++ b/etc/config/windows/configure.wsf
@@ -228,10 +228,28 @@
 
     CPPFLAGS += " /M";
 
+    LDFLAGS += " /NODEFAULTLIB:\"";
+
     if (confInfo.dll)
+    {
         CPPFLAGS += "D";
+        LDFLAGS += confInfo.debug ? "msvcprtd" : "msvcprt";
+    }
     else
-        CPPFLAGS += (confInfo.mt || NOSTCRT) ? "T" : "L";
+    {
+        if (confInfo.mt || NOSTCRT)
+        {
+            CPPFLAGS += "T";
+            LDFLAGS += confInfo.debug ? "libcpmtd" : "libcpmt";
+        }
+        else
+        {
+            CPPFLAGS += "L";
+            LDFLAGS += confInfo.debug ? "libcpd" : "libcp";
+        }
+    }
+
+    LDFLAGS += ".lib\"";
 
     if (confInfo.debug)
     {
@@ -248,10 +266,6 @@
     
     CPPFLAGS += joinArray(defines, "/D");
     
-    LDFLAGS += " /NODEFAULTLIB:libcp /NODEFAULTLIB:libcpd" +
-               " /NODEFAULTLIB:libcpmt /NODEFAULTLIB:libcpmtd" +
-               " /NODEFAULTLIB:msvcprt /NODEFAULTLIB:msvcprtd";
-
     var exitmsg = "You may see log here: " + logFileNameURI;
 
     // sanity check
diff --git a/etc/config/windows/filterdef.js b/etc/config/windows/filterdef.js
index 4bb8ad6..0ef6b09 100644
--- a/etc/config/windows/filterdef.js
+++ b/etc/config/windows/filterdef.js
@@ -25,7 +25,7 @@
 
 var sourceFilterName = "Source Files";
 var sourceFilterUuid = "{4FC737F1-C7A5-4376-A066-2A32D752A2FF}";
-var sourceFilterExts = ".cpp;.cxx;.s";
+var sourceFilterExts = ".cpp;.cxx;.s;.asm";
 
 var headerFilterName = "Header Files";
 var headerFilterUuid = "{93995380-89BD-4b04-88EB-625FBE52EBFB}";
@@ -59,6 +59,28 @@
 // common macros
 var cmnMacros = new Array();
 
+// init custom build rule for .asm files
+function InitAsmTool(VCFile)
+{
+    var cfgs = VCFile.FileConfigurations;
+    for (var i = 1; i <= cfgs.Count; ++i)
+    {
+        var cfg = cfgs.Item(i);
+        if ((typeof(cfg.Tool.ToolKind) != "undefined" &&
+            cfg.Tool.ToolKind != "VCCustomBuildTool") ||
+            cfg.Tool.ToolName != "Custom Build Tool")
+        {
+            cfg.Tool = cfg.ProjectConfiguration.FileTools.Item("VCCustomBuildTool");
+        }
+
+        var tool = cfg.Tool;
+        tool.Description = "Compiling .asm file...";
+        tool.Outputs = "$(IntDir)\\$(InputName).obj";
+        tool.CommandLine = AS + " /c /nologo /D" + PLATFORM + " /Fo" + tool.Outputs +
+                           " /W3 /Zi /Ta" + VCFile.RelativePath;
+    }
+}
+
 //------------------------------------------------
 // FilterDef class
 //------------------------------------------------
@@ -126,7 +148,9 @@
     var VCFile = filter.AddFile(filename);
     if (null != filetype && typeof(VCFile.FileType) != "undefined")
         VCFile.FileType = filetype;
-        
+
+    var customFileDef = null;
+
     if (exclude)
     {
         var cfgs = VCFile.FileConfigurations;
@@ -144,6 +168,8 @@
             cfg.ExcludedFromBuild = exclude;
         }
     }
+    else if (".asm" == VCFile.Extension)
+        InitAsmTool(VCFile);
 }
 
 // create VCFilter object from the FilterDef definition
diff --git a/etc/config/windows/fun_present_check.cpp b/etc/config/windows/fun_present_check.cpp
index c667423..379fb7b 100644
--- a/etc/config/windows/fun_present_check.cpp
+++ b/etc/config/windows/fun_present_check.cpp
@@ -1,3 +1,26 @@
+
+/***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1999-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 extern "C"
 {
     typedef void (*funptr_t)();
diff --git a/etc/config/windows/generate.wsf b/etc/config/windows/generate.wsf
index 5e9e64d..e912299 100644
--- a/etc/config/windows/generate.wsf
+++ b/etc/config/windows/generate.wsf
@@ -25,11 +25,11 @@
 Generates solution file for a specified environment
             </description>
             <named helpstring="Name of the compiler configuration"
-                name="CONFIG" required="true" type="string"/>
+                name="CONFIG" required="false" type="string"/>
             <named helpstring="Top directory of stdcxx sources tree" 
                 name="TOPDIR" required="false" type="string"/>
             <named helpstring="Output directory for modules" 
-                name="BUILDDIR" required="true" type="string"/>
+                name="BUILDDIR" required="false" type="string"/>
             <named helpstring="Copy dll to exe option" 
                 name="COPYDLL" required="false" type="string"/>
             <named helpstring="Generate locales projects" 
@@ -40,8 +40,8 @@
                 /BUILDDIR:"C:\stdcxx\build" /CONFIG:msvc-7.1
             </example>
             <usage>
-Usage: cscript generate.wsf /CONFIG:@CONFIG 
-/BUILDDIR:@BUILDDIR [/TOPDIR:@TOPDIR] [/COPYDLL:@COPYDLL]
+Usage: cscript generate.wsf [/CONFIG:@CONFIG]
+[/BUILDDIR:@BUILDDIR] [/TOPDIR:@TOPDIR] [/COPYDLL:@COPYDLL]
 [/LOCALES:@LOCALES] [/LOCALETESTS:@LOCALETESTS]
 where
 @CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc).
@@ -108,7 +108,7 @@
 {
     Echo("Solution generation script");
     Echo("Checking arguments...");
-    
+
     readAndCheckArguments();
     createBuildDirs();
     
@@ -116,6 +116,10 @@
     outDir += "\\" + currentCfg;
 
     Echo("Checking consistence...");
+    // get solution object
+    if (null == VCProjectEngine && !InitVSObjects(currentCfg))
+        WScript.Quit(3);
+
     logFile = currentCfg + logFile;
     logStream = fso.CreateTextFile(outDir + "\\" + logFile, true, false);
 
@@ -124,9 +128,6 @@
                     new Macro("%SRCDIR%", srcDir),
                     new Macro("%BUILDDIR%", outDir));
                         
-    // get solution object
-    InitVSObjects(currentCfg);
-
     PrintVars(logStream);
     PrintVars(WScript.StdOut);
     
@@ -228,23 +229,48 @@
 // performs checking of the script parameters
 function readAndCheckArguments()
 {
-    if (!WScript.Arguments.Named.Exists("CONFIG"))
+    if (WScript.Arguments.Named.Exists("CONFIG"))
+        currentCfg = WScript.Arguments.Named("CONFIG");
+    else
     {
-        WScript.StdErr.WriteLine(
-            "Generate: Missing required argument.");
-        WScript.Arguments.ShowUsage();
+        // try to deduce it
+        // ICC cannot be used without VisualStudio installed
+        // so we check only for MSVC
+        Echo("CONFIG parameter not specified, trying to detect it...");
+        var cfgs = new Array("msvc-8.0", "msvc-7.1", "msvc-7.0");
+        for (var i = 0; i < cfgs.length; ++i)
+        {
+            var curCfg = cfgs[i];
+            Echo("Trying " + curCfg + "...");
+
+            if (InitVSObjects(curCfg))
+            {
+                Echo("Succeeded. Using CONFIG=" + curCfg + ".");
+                currentCfg = curCfg;
+                break;
+            }
+
+            Echo(curCfg + " checking failed.");
+        }
+    }
+
+    if ("" == currentCfg)
+    {
+        WScript.StdErr.WriteLine("No suitable config file detected.");
         WScript.Quit(2);
     }
     
-    if (!WScript.Arguments.Named.Exists("BUILDDIR"))
+    if (WScript.Arguments.Named.Exists("BUILDDIR"))
     {
-        WScript.StdErr.WriteLine(
-            "Generate: Missing required argument BUILDDIR.");
-        WScript.Arguments.ShowUsage();
-        WScript.Quit(2);
+        outDir = WScript.Arguments.Named("BUILDDIR");
+        outDir = fso.GetAbsolutePathName (outDir);
     }
-    
-    currentCfg = WScript.Arguments.Named("CONFIG");
+    else
+    {
+        // use current directory
+        outDir = WshShell.CurrentDirectory;
+        Echo("BUILDDIR parameter not specified, using BUILDDIR=" + outDir);
+    }
     
     if (WScript.Arguments.Named.Exists("TOPDIR"))
     {
@@ -264,6 +290,7 @@
         }
         
         srcDir = myDir.substr(0, dirIndex);
+        Echo("TOPDIR parameter not specified, using TOPDIR=" + srcDir);
     }
    
     if (srcDir != "")
@@ -275,14 +302,6 @@
                 + srcDir);
             WScript.Quit(2);
         }
-        
-        outDir = srcDir;
-    }
-    
-    if (WScript.Arguments.Named.Exists("BUILDDIR"))
-    {
-        outDir = WScript.Arguments.Named("BUILDDIR");
-        outDir = fso.GetAbsolutePathName (outDir);
     }
     
     if (WScript.Arguments.Named.Exists("COPYDLL"))
@@ -409,8 +428,8 @@
 
         buildBatchFile.WriteLine("cscript /nologo "
             + "\"%topdir%\\%scriptdir%\\build.wsf\""
-            + " /BUILDDIR:\"%builddir%\" /BUILDTYPE:%cfgbrief%"
-            + " /CONFIG:" + currentCfg);
+            + " /BUILDDIR:\"%builddir%\" /TOPDIR:\"%topdir%\""
+            + " /BUILDTYPE:%cfgbrief% /CONFIG:" + currentCfg);
         buildBatchFile.WriteLine("cscript /nologo "
             + "\"%topdir%\\%scriptdir%\\%makelog%\""
             + " /BUILDDIR:\"%builddir%\" /BUILDTYPE:%cfgbrief%"
diff --git a/etc/config/windows/icc-10.0-x64.config b/etc/config/windows/icc-10.0-x64.config
new file mode 100644
index 0000000..0645b43
--- /dev/null
+++ b/etc/config/windows/icc-10.0-x64.config
@@ -0,0 +1,36 @@
+//
+// $Id$
+//
+// icc-10.0-x64.config - configuration file for 64 bit Intel C++ 10.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
+#include msvc-8.0-x64
+DEVENVFLAGS=/useenv
+CPPFLAGS=
+LDFLAGS=
+CONVERT=1
+CXX=icl
+LD=icl
+AR=xilib
+CLVARSBAT=%ICPP_COMPILER10%\EM64T\Bin\iclvars.bat
+ICCCONVERT=ICProjConvert100.exe
+ICCVER=10.0
diff --git a/etc/config/windows/icc-10.0.config b/etc/config/windows/icc-10.0.config
new file mode 100644
index 0000000..47c8b29
--- /dev/null
+++ b/etc/config/windows/icc-10.0.config
@@ -0,0 +1,36 @@
+//
+// $Id$
+//
+// icc-10.0.config - configuration file for Intel C++ 10.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
+#include msvc-8.0
+DEVENVFLAGS=/useenv
+CPPFLAGS=
+LDFLAGS=
+CONVERT=1
+CXX=icl
+LD=icl
+AR=xilib
+CLVARSBAT=%ICPP_COMPILER10%\IA32\Bin\iclvars.bat
+ICCCONVERT=ICProjConvert100.exe
+ICCVER=10.0
diff --git a/etc/config/windows/icc-9.0.config b/etc/config/windows/icc-9.0.config
index 71ddf4f..d6ed3d5 100644
--- a/etc/config/windows/icc-9.0.config
+++ b/etc/config/windows/icc-9.0.config
@@ -1,3 +1,28 @@
+//
+// $Id$
+//
+// icc-9.0.config - configuration file for Intel C++ 9.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
 #include msvc-7.1
 DEVENVFLAGS=/useenv
 CPPFLAGS=
@@ -7,3 +32,4 @@
 LD=icl
 AR=xilib
 CLVARSBAT=%ICPP_COMPILER90%\IA32\Bin\iclvars.bat
+ICCVER=9.0
diff --git a/etc/config/windows/icc-9.1-x64.config b/etc/config/windows/icc-9.1-x64.config
new file mode 100644
index 0000000..9001d0d
--- /dev/null
+++ b/etc/config/windows/icc-9.1-x64.config
@@ -0,0 +1,35 @@
+//
+// $Id$
+//
+// icc-9.1-x64.config - configuration file for 64 bit Intel C++ 9.1
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
+#include msvc-8.0-x64
+DEVENVFLAGS=/useenv
+CPPFLAGS=
+LDFLAGS=
+CONVERT=1
+CXX=icl
+LD=icl
+AR=xilib
+CLVARSBAT=%ICPP_COMPILER91%\EM64T\Bin\iclvars.bat
+ICCVER=9.1
diff --git a/etc/config/windows/icc-9.1.config b/etc/config/windows/icc-9.1.config
index 95ccc07..af13f04 100644
--- a/etc/config/windows/icc-9.1.config
+++ b/etc/config/windows/icc-9.1.config
@@ -1,3 +1,28 @@
+//
+// $Id$
+//
+// icc-9.1.config - configuration file for Intel C++ 9.1
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
 #include msvc-8.0
 DEVENVFLAGS=/useenv
 CPPFLAGS=
@@ -7,3 +32,4 @@
 LD=icl
 AR=xilib
 CLVARSBAT=%ICPP_COMPILER91%\IA32\Bin\iclvars.bat
+ICCVER=9.1
diff --git a/etc/config/windows/msvc-7.0.config b/etc/config/windows/msvc-7.0.config
index 5cd812a..e7ec39a 100644
--- a/etc/config/windows/msvc-7.0.config
+++ b/etc/config/windows/msvc-7.0.config
@@ -1,7 +1,33 @@
+//
+// $Id$
+//
+// msvc-7.0.config - configuration file for Microsoft Visual C++ 7.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
 // Version of the used MS VisualStudio:
 // 7 for MS VisualStudio .NET
 // 7.1 for MS VisualStudio .NET 2003
-// 8 for MS VisualStudio 2005 and MSVC 2005 Express Edition
+// 8.0 for MS VisualStudio 2005 and MSVC 2005 Express Edition
+// 9.0 for MS VisualStudio 2008
 VERSION=7
 
 // Path to the MS VisualStudio IDE executable:
@@ -17,8 +43,8 @@
 // if empty it will be tried to be detected automatically
 WINDIFF=
 
-// Path to the ICProjConvert90.exe utility:
-// if empty it will be tried to be detected automatically
+// Path of the ICProjConvertxx.exe utility:
+// if path is empty it will be tried to be detected automatically
 ICCCONVERT=
 
 // Convert solution to ICC format
@@ -30,14 +56,19 @@
 CPPFLAGS=
 // additional flags for the linker
 LDFLAGS=
+// additional libraries
+LIBS=
 
-// CXX, LD, AD used only at configure build step
+// CXX, LD, AR used only at configure build step
 // CXX - command invoked to compile the test source file
 // LD - command invoked to link the test
 // AR - command invoked to make library
+// AS will be used at solution generation build step
+// to initialize Custom Build Rule for compiling .asm files
 CXX=cl
 LD=cl
 AR=lib
+AS=ml
 
 // Use singlethreaded or mutlithreaded CRT in 11s, 11d solution configurations
 // 0 for MS VisualStudio .NET and MS VisualStudio .NET 2003
@@ -54,12 +85,14 @@
 // 7.00 for MS VisualStudio .NET
 // 8.00 for MS VisualStudio .NET 2003
 // 9.00 for MS VisualStudio 2005 and MSVC 2005 Express Edition
+// 10.00 for MS VisualStudio 2008
 SLNVER=7.00
 
 // Comment in produced solution file:
 // empty for MS VisualStudio .NET and MS VisualStudio .NET 2003
 // Visual Studio 2005 - for MS VisualStudio 2005
 // Visual C++ Express 2005 - for MSVC 2005 Express Edition
+// Visual Studio 2008 - for MS VisualStudio 2008
 SLNCOMMENT=
 
 // Type of produced file buildlog.htm:
@@ -70,3 +103,7 @@
 // Path to the ICC iclvars.bat
 // Should be empty for MSVC
 CLVARSBAT=
+
+// Version of the Intel C++
+// Should be empty for MSVC
+ICCVER=
diff --git a/etc/config/windows/msvc-7.1.config b/etc/config/windows/msvc-7.1.config
index eff33b2..4022869 100644
--- a/etc/config/windows/msvc-7.1.config
+++ b/etc/config/windows/msvc-7.1.config
@@ -1,3 +1,28 @@
+//
+// $Id$
+//
+// msvc-7.1.config - configuration file for Microsoft Visual C++ 7.1
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
 #include msvc-7.0
 VERSION=7.1
 CPPFLAGS=
diff --git a/etc/config/windows/msvc-8.0-x64.config b/etc/config/windows/msvc-8.0-x64.config
index 1691a61..ee0a34f 100644
--- a/etc/config/windows/msvc-8.0-x64.config
+++ b/etc/config/windows/msvc-8.0-x64.config
@@ -1,2 +1,29 @@
+//
+// $Id$
+//
+// msvc-8.0-x64.config - configuration file for
+//                       64 bit Microsoft Visual C++ 8.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
 #include msvc-8.0
 PLATFORM=x64
+AS=ml64
diff --git a/etc/config/windows/msvc-8.0.config b/etc/config/windows/msvc-8.0.config
index 187fd00..0991fa6 100644
--- a/etc/config/windows/msvc-8.0.config
+++ b/etc/config/windows/msvc-8.0.config
@@ -1,3 +1,28 @@
+//
+// $Id$
+//
+// msvc-8.0.config - configuration file for Microsoft Visual C++ 8.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
 #include msvc-7.0
 VERSION=8.0
 CPPFLAGS=/D_CRT_SECURE_NO_DEPRECATE
diff --git a/etc/config/windows/msvc-9.0-x64.config b/etc/config/windows/msvc-9.0-x64.config
new file mode 100644
index 0000000..d2167d9
--- /dev/null
+++ b/etc/config/windows/msvc-9.0-x64.config
@@ -0,0 +1,29 @@
+//
+// $Id$
+//
+// msvc-9.0-x64.config - configuration file for
+//                       64 bit Microsoft Visual C++ 9.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
+#include msvc-9.0
+PLATFORM=x64
+AS=ml64
diff --git a/etc/config/windows/msvc-9.0.config b/etc/config/windows/msvc-9.0.config
new file mode 100644
index 0000000..0b5626f
--- /dev/null
+++ b/etc/config/windows/msvc-9.0.config
@@ -0,0 +1,29 @@
+//
+// $Id$
+//
+// msvc-9.0.config - configuration file for Microsoft Visual C++ 9.0
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
+#include msvc-8.0
+VERSION=9.0
+SLNVER=10.00
+SLNCOMMENT=Visual Studio 2008
diff --git a/etc/config/windows/msvcex-8.0.config b/etc/config/windows/msvcex-8.0.config
index b7c5150..7ab4e8a 100644
--- a/etc/config/windows/msvcex-8.0.config
+++ b/etc/config/windows/msvcex-8.0.config
@@ -1,3 +1,30 @@
+//
+// $Id$
+//
+// msvcex-8.0.config - configuration file for
+//                     Microsoft Visual C++ 8.0 Express Edition
+//
+//////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+// 
+//////////////////////////////////////////////////////////////////////
+
 #include msvc-8.0
 DEVENV=VCExpress.exe
 SLNCOMMENT=Visual C++ Express 2005
+LIBS=user32.lib
diff --git a/etc/config/windows/projectdef.js b/etc/config/windows/projectdef.js
index e0d016b..336bf47 100644
--- a/etc/config/windows/projectdef.js
+++ b/etc/config/windows/projectdef.js
@@ -27,9 +27,6 @@
 var TristateTrue = -1;
 var TristateFalse = 0;
 
-// the timeout for the exec utility
-var execTimeout = 180;
-
 var dte = null;
 var VCProjectEngine = null;
 var ICConvertTool = "ICProjConvert90.exe";
@@ -69,24 +66,28 @@
 
     if (CONVERT)
     {
+        if (ICCCONVERT == "")
+            ICCCONVERT = "ICProjConvert90.exe";
+
         var ICConvertTool = ICCCONVERT;
 
         var arrPath = new Array(ICConvertTool);
 
-        if (ICConvertTool == "")
+        if (0 > ICConvertTool.indexOf("\\"))
         {
-            ICConvertTool = "ICProjConvert90.exe";
-            arrPath[0] = ICConvertTool;
+            // no file path specified
+            // try to detect the path
             if (null != dte)
             {
                 try
                 {
                     var isettings = dte.GetObject("IntelOptions");
-                    var icompiler = isettings.Compiler(isettings.CurrentCompilerIndex);
-                    var path = icompiler.ExecutablePath.split(";");
-                    for (var i = 0; i < path.length; ++i)
-                        arrPath.push("\"" + path[i] + "\\" + ICConvertTool + "\"");
-                    icompiler = null;
+                    for (var i = 1; i <= isettings.CompilersCount; ++i)
+                    {
+                        var paths = isettings.Compiler(i).ExecutablePath.split(";");
+                        for (var j = 0; j < paths.length; ++j)
+                            arrPath.push("\"" + isettings.Evaluate(paths[j]) + "\\" + ICConvertTool + "\"");
+                    }
                     isettings = null;
                 }
                 catch (e) {}
@@ -106,6 +107,7 @@
         if (!success)
         {
             WScript.StdErr.WriteLine(ICCCONVERT + " conversion utility not found");
+            WScript.StdErr.WriteLine("You should check ICCCONVERT configuration variable");
             WScript.Quit(3);
         }
     }
@@ -123,8 +125,10 @@
     catch (e)
     {
         WScript.StdErr.WriteLine("Unable to create VCProjectEngine object: " + e.message);
-        WScript.Quit(3);
+        return false;
     }
+
+    return true;
 }
 
 //------------------------------------------------
@@ -138,7 +142,7 @@
     this.Type = type;
     this.SubSystem = typeGeneric == type ? null :
         (typeApplication == type ? subSystemConsole : subSystemWindows);
-    this.RTTI = false;
+    this.RTTI = true;
     this.VCProjDir = "%BUILDDIR%";
     this.FilterDefs = new Array();
     this.Defines = null;
@@ -441,7 +445,7 @@
                     if (!setProperty(compiler.OptimizeForWindowsApplication, true))
                         compiler.AdditionalOptions += " /GA";
                 }
-                compiler.Optimization = optimizeMinSpace;
+                compiler.Optimization = optimizeMaxSpeed;
                 compiler.MinimalRebuild = false;
                 setProperty(compiler.SmallerTypeCheck, false);
                 setProperty(compiler.BasicRuntimeChecks, runtimeBasicCheckNone);
@@ -487,9 +491,22 @@
             linker.GenerateDebugInformation = true;
             if (null != this.Libs)
                 linker.AdditionalDependencies = this.Libs;
-            linker.IgnoreDefaultLibraryNames = "libcp.lib;libcpd.lib;" +
-                                               "libcpmt.lib;libcpmtd.lib;" +
-                                               "msvcprt.lib;msvcprtd.lib";
+
+            if (confInfo.dll)
+            {
+                linker.IgnoreDefaultLibraryNames =
+                    confInfo.debug ? "msvcprtd.lib" : "msvcprt.lib";
+            }
+            else
+            {
+                if (confInfo.mt || NOSTCRT)
+                    linker.IgnoreDefaultLibraryNames =
+                        confInfo.debug ? "libcpmtd.lib" : "libcpmt.lib";
+                else
+                    linker.IgnoreDefaultLibraryNames =
+                        confInfo.debug ? "libcpd.lib" : "libcp.lib";
+            }
+
             linker.SubSystem = this.SubSystem;
             if (confInfo.debug)
             {
@@ -793,7 +810,7 @@
     sanityDef.PreBuildCmd +=
         "echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
         " /s /b:\"" + bindir + "\" > \"" + test + ".bat\"";
-    sanityDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + execTimeout + " \"" + test + ".bat\"";
+    sanityDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + EXEC_TIMEOUT + " \"" + test + ".bat\"";
     sanityDef.CustomBuildOut = test + ".out";
     projectDefs.push(sanityDef);
         
@@ -846,7 +863,7 @@
             "echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
             " /f /b:\"" + bindir + "\" /i:\"" + nlsDir + "\"" +
             " /l:" + locale.Name + " > \"" + test + ".bat\"";
-        projectDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + execTimeout + " \"" + test + ".bat\"";
+        projectDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + EXEC_TIMEOUT + " \"" + test + ".bat\"";
         projectDef.CustomBuildOut = test + ".out";
         projectDef.PrjDeps.push(sanityDef);
         
diff --git a/etc/config/windows/projects.js b/etc/config/windows/projects.js
index caef2e9..c7424e0 100644
--- a/etc/config/windows/projects.js
+++ b/etc/config/windows/projects.js
@@ -27,7 +27,6 @@
 var commonIncludes = "$(SolutionDir)%CONFIG%\\include";
 var stdcxxIncludes = "%SRCDIR%\\include;%SRCDIR%\\include\\ansi;" + commonIncludes;
 var rwtestIncludes = "%SRCDIR%\\tests\\include;" + stdcxxIncludes;
-var commonLibs = "kernel32.lib user32.lib";
 
 var binPath = "$(SolutionDir)%CONFIG%\\bin";
 var libPath = "$(SolutionDir)%CONFIG%\\lib";
@@ -35,7 +34,7 @@
 var ProjectsDir = "%BUILDDIR%\\Projects";
 
 // projects which requires RTTI support
-var RTTIProjects = new Array("18.exception");
+var NonRTTIProjects = new Array();
 
 var rxExcludedFolders = 
     new RegExp("^(?:\\.svn|Release.*|Debug.*|in|out|CVS)$","i");
@@ -67,7 +66,8 @@
     configureDef.IntDir = configureDef.OutDir;
     configureDef.CustomBuildFile = "configure.wsf";
     if (0 < CLVARSBAT.length)
-        configureDef.CustomBuildCmd = "call \"" + CLVARSBAT + "\"\r\n";
+        configureDef.CustomBuildCmd = "echo Calling \"" + CLVARSBAT + "\"\r\n" +
+                                      "call \"" + CLVARSBAT + "\"\r\n";
     else
         configureDef.CustomBuildCmd = "";
     configureDef.CustomBuildCmd += "cscript /nologo \"%CUSTOMFILE%\"" +
@@ -86,9 +86,8 @@
 ///////////////////////////////////////////////////////////////////////////////
     var stdcxxDef = new ProjectDef(".stdcxx", typeLibrary);
     stdcxxDef.VCProjDir = ProjectsDir;
-    stdcxxDef.RTTI = true;
     stdcxxDef.FilterDefs.push(
-        new FilterDef(sourceFilterName, sourceFilterUuid, sourceFilterExts, eFileTypeCppCode, false).
+        new FilterDef(sourceFilterName, sourceFilterUuid, sourceFilterExts + ";.inc", eFileTypeCppCode, false).
             addFilesByMask("%SRCDIR%\\src", rxExcludedFolders, null));
     stdcxxDef.FilterDefs.push(
         new FilterDef(headerFilterName, headerFilterUuid, headerFilterExts, eFileTypeCppHeader, true).
@@ -99,7 +98,7 @@
     stdcxxDef.Includes = stdcxxIncludes;
     stdcxxDef.OutDir = libPath;
     stdcxxDef.IntDir = "$(SolutionDir)%CONFIG%\\src";
-    stdcxxDef.Libs = commonLibs;
+    stdcxxDef.Libs = LIBS;
     stdcxxDef.OutFile = "$(OutDir)\\libstd%CONFIG%%EXT%";
     stdcxxDef.PrjDeps.push(configureDef);
 
@@ -120,7 +119,7 @@
     rwtestDef.Includes = rwtestIncludes;
     rwtestDef.OutDir = "$(SolutionDir)%CONFIG%\\tests";
     rwtestDef.IntDir = rwtestDef.OutDir + "\\src";
-    rwtestDef.Libs = commonLibs;
+    rwtestDef.Libs = LIBS;
     rwtestDef.PrjRefs.push(stdcxxDef);
 
     projectDefs.push(new Array(rwtestDef));
@@ -141,7 +140,7 @@
     execDef.Defines = "";
     execDef.Includes = commonIncludes;
     execDef.OutDir = binPath;
-    execDef.Libs = commonLibs;
+    execDef.Libs = LIBS;
     execDef.OutFile = "$(OutDir)\\exec.exe";
     execDef.PrjDeps.push(configureDef);
 
@@ -168,7 +167,7 @@
     localedefDef.Defines = commonDefines;
     localedefDef.Includes = stdcxxIncludes;
     localedefDef.OutDir = binPath;
-    localedefDef.Libs = commonLibs;
+    localedefDef.Libs = LIBS;
     localedefDef.OutFile = "$(OutDir)\\localedef.exe";
     localedefDef.PrjRefs.push(stdcxxDef);
 
@@ -184,13 +183,29 @@
     localeDef.Defines = commonDefines;
     localeDef.Includes = stdcxxIncludes;
     localeDef.OutDir = binPath;
-    localeDef.Libs = commonLibs;
+    localeDef.Libs = LIBS;
     localeDef.OutFile = "$(OutDir)\\locale.exe";
     localeDef.PrjDeps.push(configureDef);
 
     utilsArray.push(localeDef);
 
 ///////////////////////////////////////////////////////////////////////////////
+    var gencatDef = new ProjectDef("util_gencat", typeApplication);
+    gencatDef.VCProjDir = ProjectsDir + "\\util";
+    gencatDef.FilterDefs.push(
+        new FilterDef(sourceFilterName, sourceFilterUuid, sourceFilterExts, eFileTypeCppCode, false).
+            addFiles("%SRCDIR%\\util",
+                new Array("gencat.cpp")));
+    gencatDef.Defines = commonDefines;
+    gencatDef.Includes = stdcxxIncludes;
+    gencatDef.OutDir = binPath;
+    gencatDef.Libs = LIBS;
+    gencatDef.OutFile = "$(OutDir)\\gencat.exe";
+    gencatDef.PrjRefs.push(stdcxxDef);
+
+    utilsArray.push(gencatDef);
+
+///////////////////////////////////////////////////////////////////////////////
     var utilsDef = new ProjectDef(".stdcxx_utils", typeGeneric);
     utilsDef.VCProjDir = ProjectsDir + "\\util";
     utilsDef.OutDir = binPath;
@@ -198,6 +213,7 @@
     utilsDef.PrjDeps.push(execDef);
     utilsDef.PrjDeps.push(localedefDef);
     utilsDef.PrjDeps.push(localeDef);
+    utilsDef.PrjDeps.push(gencatDef);
 
     utilsArray.push(utilsDef);
 
@@ -211,7 +227,7 @@
     exampleTplDef.Defines = commonDefines;
     exampleTplDef.Includes = "%SRCDIR%\\examples\\include;" + stdcxxIncludes;
     exampleTplDef.OutDir = "$(SolutionDir)%CONFIG%\\examples";
-    exampleTplDef.Libs = commonLibs;
+    exampleTplDef.Libs = LIBS;
     exampleTplDef.PrjRefs.push(stdcxxDef);
     
     var exampleDefs = exampleTplDef.createProjectDefsFromFolder(
@@ -256,7 +272,8 @@
         " /EXEDIR:\"$(OutDir)\"" +
         " /PRJDIR:\"" + runexamplesDef.VCProjDir + "\"" +
         " /CONFIG:\"%SOLUTION%\"" +
-        " /LOGFILE:\"runexamples.log\"";
+        " /LOGFILE:\"runexamples.log\"" +
+        " /RUNFLAGS:\"-t " + EXEC_TIMEOUT + "\"";
     runexamplesDef.CustomBuildOut = "$(OutDir)\\runexamples.log";
     runexamplesDef.CustomBuildDeps = "%FILES%";
     //runexamplesDef.PrjDeps.push(allexamplesDef);
@@ -269,11 +286,10 @@
 
     var testTplDef = new ProjectDef(null, typeApplication);
     testTplDef.VCProjDir = ProjectsDir + "\\tests";
-    testTplDef.RTTI = true;
     testTplDef.Defines = commonDefines;
     testTplDef.Includes = rwtestIncludes;
     testTplDef.OutDir = "$(SolutionDir)%CONFIG%\\tests";
-    testTplDef.Libs = commonLibs;
+    testTplDef.Libs = LIBS;
     testTplDef.PrjRefs.push(stdcxxDef);
     testTplDef.PrjRefs.push(rwtestDef);
     
@@ -312,16 +328,18 @@
     runtestsDef.CustomBuildFile = "runall.wsf";
     runtestsDef.CustomBuildCmd =
         "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+        "set TOPDIR=%SRCDIR%\r\n" +
+        "set BINDIR=$(SolutionDir)%CONFIG%\\bin\r\n" +
         "cscript /nologo \"%CUSTOMFILE%\"" +
         " /EXEDIR:\"$(OutDir)\"" +
         " /PRJDIR:\"" + runtestsDef.VCProjDir + "\"" +
         " /CONFIG:\"%SOLUTION%\"" +
-        " /COMPAT" +
-        " /LOGFILE:\"runtests.log\"";
+        " /LOGFILE:\"runtests.log\"" +
+        " /RUNFLAGS:\"--compat -x \'--compat -O -\' -t " + EXEC_TIMEOUT + "\"";
     runtestsDef.CustomBuildOut = "$(OutDir)\\runtests.log";
     runtestsDef.CustomBuildDeps = "%FILES%";
     //runtestsDef.PrjDeps.push(alltestsDef);
-    runtestsDef.PrjDeps.push(execDef);
+    runtestsDef.PrjDeps.push(utilsDef);
 
     projectDefs.push(new Array(runtestsDef));
 
@@ -394,7 +412,8 @@
         " /EXEDIR:\"$(OutDir)\"" +
         " /CONFIG:\"%SOLUTION%\"" +
         " /LOGFILE:\"runloctests.log\"" +
-        " /EXT:bat";
+        " /EXT:bat" +
+        " /RUNFLAGS:\"-t " + EXEC_TIMEOUT + "\"";
     testlocaleTplDef.CustomBuildOut = "$(OutDir)\\runloctests.log";
 
     var testlocalesDef = testlocaleTplDef.createTestLocalesDef("%SRCDIR%\\etc\\nls");
@@ -424,15 +443,20 @@
                 var arrDeps = projectDef.PrjRefs.concat(projectDef.PrjDeps);
                 var command = "";
     
+                var cmdtpl = "set src=_SRC_\r\n" +
+                             "set dst=_DST_\r\n" +
+                             "if /I not %src%==%dst% (\r\n" +
+                             "if exist %src% (\r\n" +
+                             "del %dst%\r\n" +
+                             "copy /Y %src% %dst%\r\n" +
+                             "))";
+
                 if (0 <= arrayIndexOf(arrDeps, stdcxxDef))
                 {
                     var libname = "libstd%CONFIG%.dll";
                     var src = "\"" + libPath + "\\" + libname + "\"";
                     var dst = "\"$(OutDir)\\" + libname + "\"";
-                    var cmd = "if exist " + src + " (\r\n" +
-                              "del " + dst + "\r\n" +
-                              "copy /Y " + src + " " + dst + "\r\n" +
-                              ")";
+                    var cmd = cmdtpl.replace("_SRC_", src).replace("_DST_", dst);
                     if (0 == command.length)
                         command = cmd;
                     else
@@ -444,10 +468,7 @@
                     var libname = "rwtest.dll";
                     var src = "\"$(SolutionDir)%CONFIG%\\tests\\" + libname + "\"";
                     var dst = "\"$(OutDir)\\" + libname + "\"";
-                    var cmd = "if exist " + src + " (\r\n" +
-                              "del " + dst + "\r\n" +
-                              "copy /Y " + src + " " + dst + "\r\n" +
-                              ")";
+                    var cmd = cmdtpl.replace("_SRC_", src).replace("_DST_", dst);
                     if (0 == command.length)
                         command = cmd;
                     else
@@ -478,9 +499,9 @@
         {
             var projectDef = projectArray[j];
     
-            // turn on RTTI support if project in RTTIProjects array
-            if (0 <= arrayIndexOf(RTTIProjects, projectDef.Name))
-                projectDef.RTTI = true;
+            // turn off RTTI support if project in NonRTTIProjects array
+            if (0 <= arrayIndexOf(NonRTTIProjects, projectDef.Name))
+                projectDef.RTTI = false;
     
             projectDef.createVCProject(VCProjectEngine, report);
         }
diff --git a/etc/config/windows/runall.wsf b/etc/config/windows/runall.wsf
index fde9836..dbcc85a 100644
--- a/etc/config/windows/runall.wsf
+++ b/etc/config/windows/runall.wsf
@@ -34,10 +34,10 @@
                 name="INOUTDIR" required="false" type="string"/>
             <named helpstring="The log file" name="LOGFILE" 
                 required="false" type="string"/>
-            <named helpstring="Run tests in compat mode" name="COMPAT" 
-                required="false" type="string"/>
             <named helpstring="The examples extension" name="EXT" 
                 required="false" type="string"/>
+            <named helpstring="The additional options for exec utility"
+                name="RUNFLAGS" required="false" type="string"/>
             <example>
             cscript runall.wsf /EXEDIR:"C:\stdcxx\build\examples" 
             /PRJDIR:"C:\stdcxx\build\projects\examples"
@@ -46,7 +46,7 @@
             <usage>
 Usage: cscript runexamples.wsf /EXEDIR:@EXEDIR /CONFIG:@CONFIG
 [/PRJDIR:@PRJDIR] [/INOUTDIR:@INOUTDIR] [/LOGFILE:@LOGFILE]
-[/COMPAT] [/EXT:@EXT]
+[/EXT:@EXT] [/RUNFLAGS:@RUNFLAGS]
 where
 @EXEDIR is the root directory with executables to be run and checked,
 @PRJDIR is the directory with .vcproj files of the executables,
@@ -54,8 +54,8 @@
 required by executables,
 @CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc),
 @LOGFILE is the log file name,
-@COMPAT is the option for run tests in compat mode,
 @EXT is the extension of the example files, default value: "exe".
+@RUNFLAGS is the additional options for exec utility
             </usage>
         </runtime>
         <object id="fso" progid="Scripting.FileSystemObject"/>
@@ -76,8 +76,8 @@
 var currentCfg = "msvc-7.1" // the configuration
 var logFileName = ""; // the log file name
 var logFileDefault = "runexamples.log"; // the default log file name
-var compatMode = false;
 var ext = "exe";
+var runflags = "";
 
 var varOut = "out";
 
@@ -88,8 +88,6 @@
 var exBadCode = 0;
 var exNotCompiled = 0;
 
-var runTimeout = 180;
-
 var buildlogFile = "BuildLog.htm";
 var summaryFileName = "Summary.htm";
 var htmFolderName = "temphtm";
@@ -165,12 +163,15 @@
     else
         logFileName = logFileDefault;
         
-    if (WScript.Arguments.Named.Exists("COMPAT"))
-        compatMode = true;
-    
     if (WScript.Arguments.Named.Exists("EXT"))
         ext = WScript.Arguments.Named("EXT");
     
+    if (WScript.Arguments.Named.Exists("RUNFLAGS"))
+    {
+        runflags = WScript.Arguments.Named("RUNFLAGS");
+        runflags = runflags.replace(/\'/g, "\"");
+    }
+
     if (! fso.FolderExists(examplesDir))
     {
         WScript.StdErr.WriteLine(
@@ -242,36 +243,65 @@
         ++exRun;
     }
     
-    var runCmd = "\"" + utlExec + "\" -t " + runTimeout;
+    var runCmd = utlExec;
     
     if (0 < srcDir.length)
         runCmd += " -d \"" + srcDir + "\"";
 
-    if (compatMode)
-        runCmd += " --compat -x \"--compat -O -\"";
-        
-    runCmd += " " + exeFiles.join(" ");
+    if (0 < runflags.length)
+        runCmd += " " + runflags + " ";
 
+    var targets = exeFiles.join(" ");
+    var target_list = null;
+    
     var prevDir = WshShell.CurrentDirectory;
     WshShell.CurrentDirectory = exeDir;
-    var oExec = WshShell.Exec(runCmd);
-    WshShell.CurrentDirectory = prevDir;
     
-    if (!oExec)
+    // the max command line len == 2047 for Win2000
+    // http://support.microsoft.com/kb/830473
+    var MaxCmdLineLen = 2047;
+    if (MaxCmdLineLen >= runCmd.length + targets.length)
+        runCmd += exeFiles.join(" ");
+    else
     {
-        // WScript.Echo(itemInfo.name + " failed to run");
-        return;
+        target_list = "targets.lst";
+        
+        var strm = fso.CreateTextFile(target_list, true);
+        for (var i = 0; i < exeFiles.length; ++i)
+            strm.WriteLine(exeFiles[i]);
+        strm.Close();
+        
+        runCmd += "@" + target_list;
     }
 
-    var execOut = "";
-    while (oExec.Status == 0)
+    try
     {
+        runCmd = "cmd /c " + runCmd + " 2>&1";
+        var oExec = WshShell.Exec(runCmd);
+
+        var execOut = "";
+        while (oExec.Status == 0)
+        {
+            execOut += oExec.StdOut.ReadAll();
+            WScript.Sleep(100);
+        }
+
         execOut += oExec.StdOut.ReadAll();
-        WScript.Sleep(500);
+        WScript.Echo(execOut);
     }
-    
-    WScript.Echo(execOut);
-    
+    catch (e)
+    {
+        WScript.Echo("Exception in WshShell.Exec(" + runCmd + "): " + e.message);
+        return;
+    }
+    finally
+    {
+        if (null != target_list)
+            fso.DeleteFile(target_list);
+
+        WshShell.CurrentDirectory = prevDir;
+    }
+
     for (var i = 0; i < arrInfo.length; ++i)
     {
         var itemInfo = arrInfo[i];
@@ -300,12 +330,15 @@
         {
         case  0: // OK
         case -7: // OUTPUT
+        case -8: // FORMAT
+        case -9: // NOUT
             ++exRunSucceeded;
             fileLog.WriteLine(itemInfo.name + " completed successfully, exit code " +
                 itemInfo.exitCode);
             break;
-        case -1: // other
-        case -4: // SEGV
+        case -1:  // other
+        case -4:  // SEGV
+        case -10: // TRAP
             ++exRunFailed;
             fileLog.WriteLine(itemInfo.name + " failed");
             break;
@@ -372,6 +405,15 @@
             case "OUTPUT":
                 res = -7;
                 break;
+            case "FORMAT":
+                res = -8;
+                break;
+            case "  NOUT":
+                res = -9;
+                break;
+            case "  TRAP":
+                res = -10;
+                break;
             default:
                 res = -1;
             }
diff --git a/etc/config/windows/utilities.js b/etc/config/windows/utilities.js
index bd6e24f..b959483 100644
--- a/etc/config/windows/utilities.js
+++ b/etc/config/windows/utilities.js
@@ -23,23 +23,59 @@
 // 
 //////////////////////////////////////////////////////////////////////
 
-var VERSION = "7.1";
+var VERSION = "";
 var DEVENV = "";
 var DEVENVFLAGS = "";
 var CPPFLAGS = "";
 var LDFLAGS = "";
+var LIBS = "";
 var CONVERT = false;
-var CXX = "cl";
-var LD = "cl";
-var AR = "lib";
-var SLNVER="8.00";
+var CXX = "";
+var LD = "";
+var AR = "";
+var AS = "";
+var SLNVER="";
 var SLNCOMMENT="";
 var UNICODELOG = false;
 var NOSTCRT = false;
 var WINDIFF = "";
 var ICCCONVERT = "";
-var PLATFORM = "Win32";
+var PLATFORM = "";
 var CLVARSBAT = "";
+var ICCVER="";
+
+// timeout for exec utility in seconds
+var EXEC_TIMEOUT = 300;
+
+// expand system macros
+function expandSysMacro(str)
+{
+    var env = null;
+    var pos = 0;
+
+    while (true)
+    {
+        pos = str.indexOf("%", pos);
+        if (0 > pos)
+            break;
+
+        ++pos;
+        var pos2 = str.indexOf("%", pos);
+        if (0 > pos2)
+            break;
+
+        if (null == env)
+            env = WshShell.Environment("PROCESS");
+
+        var macro = str.substring(pos, pos2);
+        pos = pos2 + 1;
+        var value = env.Item(macro);
+        if ("undefined" != typeof(value) && "" != value)
+            str = str.replace("%" + macro + "%", value);
+    }
+
+    return str;
+}
 
 // read and parse compiler configuration file
 // config - name of the compiler configuration
@@ -80,6 +116,8 @@
         if (null == arr || 0 == arr[2].length)
             continue;
 
+        arr[2] = expandSysMacro(arr[2]);
+
         switch (arr[1])
         {
         case "VERSION":
@@ -97,6 +135,9 @@
         case "LDFLAGS":
             LDFLAGS = arr[2];
             break;
+        case "LIBS":
+            LIBS = arr[2];
+            break;
         case "CONVERT":
             CONVERT = parseInt(arr[2]) != 0;
             break;
@@ -109,6 +150,9 @@
         case "AR":
             AR = arr[2];
             break;
+        case "AS":
+            AS = arr[2];
+            break;
         case "SLNVER":
             SLNVER = arr[2];
             break;
@@ -133,6 +177,9 @@
         case "CLVARSBAT":
             CLVARSBAT = arr[2];
             break;
+        case "ICCVER":
+            ICCVER = arr[2];
+            break;
         }
     }
 }
@@ -140,6 +187,28 @@
 // init script variables for specified compiler configuration
 function getCompilerOpts(config)
 {
+    // set vars to initial state
+    VERSION = "";
+    DEVENV = "";
+    DEVENVFLAGS = "";
+    CPPFLAGS = "";
+    LDFLAGS = "";
+    LIBS = "";
+    CONVERT = false;
+    CXX = "";
+    LD = "";
+    AR = "";
+    AS = "";
+    SLNVER="";
+    SLNCOMMENT="";
+    UNICODELOG = false;
+    NOSTCRT = false;
+    WINDIFF = "";
+    ICCCONVERT = "";
+    PLATFORM = "";
+    CLVARSBAT = "";
+    ICCVER = "";
+
     parseConfig(config);
 
     if (0 == WINDIFF.length)
@@ -172,10 +241,12 @@
     stream.WriteLine("  DEVENVFLAGS=" + DEVENVFLAGS);
     stream.WriteLine("  CPPFLAGS=" + CPPFLAGS);
     stream.WriteLine("  LDFLAGS=" + LDFLAGS);
+    stream.WriteLine("  LIBS=" + LIBS);
     stream.WriteLine("  CONVERT=" + CONVERT);
     stream.WriteLine("  CXX=" + CXX);
     stream.WriteLine("  LD=" + LD);
     stream.WriteLine("  AR=" + AR);
+    stream.WriteLine("  AS=" + AS);
     stream.WriteLine("  SLNVER=" + SLNVER);
     stream.WriteLine("  SLNCOMMENT=" + SLNCOMMENT);
     stream.WriteLine("  UNICODELOG=" + UNICODELOG);
@@ -184,6 +255,7 @@
     stream.WriteLine("  ICCCONVERT=" + ICCCONVERT);
     stream.WriteLine("  PLATFORM=" + PLATFORM);
     stream.WriteLine("  CLVARSBAT=" + CLVARSBAT);
+    stream.WriteLine("  ICCVER=" + ICCVER);
     stream.WriteLine("");
 }
 
diff --git a/etc/config/xlC_version.sh b/etc/config/xlC_version.sh
index 82af8bd..e8cccf5 100755
--- a/etc/config/xlC_version.sh
+++ b/etc/config/xlC_version.sh
@@ -4,6 +4,28 @@
 #
 # prints IBM VisualAge and XLC/C++ version
 #
+##############################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+##############################################################################
+#
 # reported versions and patches they correspond to:
 #
 # version    release/patch
diff --git a/etc/nls/charmaps/ANSI_X3.110-1983 b/etc/nls/charmaps/ANSI_X3.110-1983
index d5bb95e..51cef50 100644
--- a/etc/nls/charmaps/ANSI_X3.110-1983
+++ b/etc/nls/charmaps/ANSI_X3.110-1983
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.110-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/ANSI_X3.4-1968 b/etc/nls/charmaps/ANSI_X3.4-1968
index f7fd9db..ca755a1 100644
--- a/etc/nls/charmaps/ANSI_X3.4-1968
+++ b/etc/nls/charmaps/ANSI_X3.4-1968
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/ASMO_449 b/etc/nls/charmaps/ASMO_449
index 906888b..4ba87e4 100644
--- a/etc/nls/charmaps/ASMO_449
+++ b/etc/nls/charmaps/ASMO_449
@@ -1,6 +1,27 @@
 <code_set_name> ASMO_449
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/BIG5 b/etc/nls/charmaps/BIG5
index 1a0a66f..0f2f550 100644
--- a/etc/nls/charmaps/BIG5
+++ b/etc/nls/charmaps/BIG5
@@ -3,7 +3,27 @@
 <mb_cur_min>  1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Chinese charmap for BIG5 (CP950)
 % version: 0.92
 % Contact: Tung-Han Hsieh   <thhsieh@linux.org.tw>
diff --git a/etc/nls/charmaps/BIG5-HKSCS b/etc/nls/charmaps/BIG5-HKSCS
index ddf95e8..f1cc143 100644
--- a/etc/nls/charmaps/BIG5-HKSCS
+++ b/etc/nls/charmaps/BIG5-HKSCS
@@ -3,7 +3,27 @@
 <mb_cur_min>  1
 <comment_char> %
 <escape_char> /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % alias BIG5HKSCS
 
 %
diff --git a/etc/nls/charmaps/BS_4730 b/etc/nls/charmaps/BS_4730
index 4ab4ac7..0b5c35a 100644
--- a/etc/nls/charmaps/BS_4730
+++ b/etc/nls/charmaps/BS_4730
@@ -1,6 +1,27 @@
 <code_set_name> BS_4730
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/BS_VIEWDATA b/etc/nls/charmaps/BS_VIEWDATA
index d250550..b7df7fe 100644
--- a/etc/nls/charmaps/BS_VIEWDATA
+++ b/etc/nls/charmaps/BS_VIEWDATA
@@ -1,6 +1,27 @@
 <code_set_name> BS_VIEWDATA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/CP10007 b/etc/nls/charmaps/CP10007
index ed674ca..381b60b 100644
--- a/etc/nls/charmaps/CP10007
+++ b/etc/nls/charmaps/CP10007
@@ -1,6 +1,27 @@
 <code_set_name> CP10007
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % This is the old MacCyrillic which M$ keeps around as CP10007.
 CHARMAP
diff --git a/etc/nls/charmaps/CP1250 b/etc/nls/charmaps/CP1250
index a807051..24a8a23 100644
--- a/etc/nls/charmaps/CP1250
+++ b/etc/nls/charmaps/CP1250
@@ -1,6 +1,27 @@
 <code_set_name> CP1250
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/charmaps/CP1251 b/etc/nls/charmaps/CP1251
index 806c5f1..ddec817 100644
--- a/etc/nls/charmaps/CP1251
+++ b/etc/nls/charmaps/CP1251
@@ -1,6 +1,27 @@
 <code_set_name> CP1251
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/charmaps/CP1252 b/etc/nls/charmaps/CP1252
index afc862f..ab741b0 100644
--- a/etc/nls/charmaps/CP1252
+++ b/etc/nls/charmaps/CP1252
@@ -1,6 +1,27 @@
 <code_set_name> CP1252
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/charmaps/CP1253 b/etc/nls/charmaps/CP1253
index 1989f10..a093cab 100644
--- a/etc/nls/charmaps/CP1253
+++ b/etc/nls/charmaps/CP1253
@@ -1,6 +1,27 @@
 <code_set_name> CP1253
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/charmaps/CP1254 b/etc/nls/charmaps/CP1254
index 548025c..d8fe6ef 100644
--- a/etc/nls/charmaps/CP1254
+++ b/etc/nls/charmaps/CP1254
@@ -1,6 +1,27 @@
 <code_set_name> CP1254
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/charmaps/CP1255 b/etc/nls/charmaps/CP1255
index 278aea3..3aaaca1 100644
--- a/etc/nls/charmaps/CP1255
+++ b/etc/nls/charmaps/CP1255
@@ -1,6 +1,27 @@
 <code_set_name> CP1255
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/charmaps/CP1256 b/etc/nls/charmaps/CP1256
index 6c9fd9f..ee92321 100644
--- a/etc/nls/charmaps/CP1256
+++ b/etc/nls/charmaps/CP1256
@@ -1,6 +1,27 @@
 <code_set_name> CP1256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/charmaps/CP1257 b/etc/nls/charmaps/CP1257
index 4d9d841..a72a4d7 100644
--- a/etc/nls/charmaps/CP1257
+++ b/etc/nls/charmaps/CP1257
@@ -1,6 +1,27 @@
 <code_set_name> CP1257
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: CEN/TC304 N283
 
diff --git a/etc/nls/charmaps/CP1258 b/etc/nls/charmaps/CP1258
index 2166c21..66b556c 100644
--- a/etc/nls/charmaps/CP1258
+++ b/etc/nls/charmaps/CP1258
@@ -1,6 +1,27 @@
 <code_set_name> CP1258
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 CHARMAP
diff --git a/etc/nls/charmaps/CP437 b/etc/nls/charmaps/CP437
index 3b321ee..daf3e04 100644
--- a/etc/nls/charmaps/CP437
+++ b/etc/nls/charmaps/CP437
@@ -1,6 +1,27 @@
 <code_set_name>    CP437
 <comment_char>     #
 <escape_char>      /
+#########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  License); you may  not use  this file  
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+#########################################################################
 
 # source: ftp://ftp.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP737.TXT
 #
diff --git a/etc/nls/charmaps/CP737 b/etc/nls/charmaps/CP737
index a59c93a..73be89f 100644
--- a/etc/nls/charmaps/CP737
+++ b/etc/nls/charmaps/CP737
@@ -1,6 +1,27 @@
 <code_set_name> CP737
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ftp://ftp.unicode.org/Public/Mappings/VENDORS/Microsoft/PC/CP737.TXT
 
diff --git a/etc/nls/charmaps/CP775 b/etc/nls/charmaps/CP775
index e34c264..47d5799 100644
--- a/etc/nls/charmaps/CP775
+++ b/etc/nls/charmaps/CP775
@@ -1,6 +1,27 @@
 <code_set_name> CP775
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ftp://ftp.unicode.org/Public/Mappings/VENDORS/Microsoft/PC/CP775.TXT
 
diff --git a/etc/nls/charmaps/CP949 b/etc/nls/charmaps/CP949
index 386d228..6e44395 100644
--- a/etc/nls/charmaps/CP949
+++ b/etc/nls/charmaps/CP949
@@ -3,6 +3,27 @@
 <escape_char> /
 <mb_cur_max> 2
 <mb_cur_min> 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0 (standard)
 %  source: ftp://ftp.unicode.org/Public/Mappings/VENDORS/Microsoft/WINDOWS/CP949.TXT
 % version: 1.1 (glibc)
diff --git a/etc/nls/charmaps/CSA_Z243.4-1985-1 b/etc/nls/charmaps/CSA_Z243.4-1985-1
index b5cccac..cc8b47c 100644
--- a/etc/nls/charmaps/CSA_Z243.4-1985-1
+++ b/etc/nls/charmaps/CSA_Z243.4-1985-1
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/CSA_Z243.4-1985-2 b/etc/nls/charmaps/CSA_Z243.4-1985-2
index f55f2ff..130eaea 100644
--- a/etc/nls/charmaps/CSA_Z243.4-1985-2
+++ b/etc/nls/charmaps/CSA_Z243.4-1985-2
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/CSA_Z243.4-1985-GR b/etc/nls/charmaps/CSA_Z243.4-1985-GR
index a7cc178..a3ac358 100644
--- a/etc/nls/charmaps/CSA_Z243.4-1985-GR
+++ b/etc/nls/charmaps/CSA_Z243.4-1985-GR
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-GR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/CSN_369103 b/etc/nls/charmaps/CSN_369103
index 640f449..3119ded 100644
--- a/etc/nls/charmaps/CSN_369103
+++ b/etc/nls/charmaps/CSN_369103
@@ -1,6 +1,27 @@
 <code_set_name> CSN_369103
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/CWI b/etc/nls/charmaps/CWI
index 052403c..6dee99d 100644
--- a/etc/nls/charmaps/CWI
+++ b/etc/nls/charmaps/CWI
@@ -1,6 +1,27 @@
 <code_set_name> CWI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: Computerworld Sza'mita'stechnika vol 3 issue 13 1988-06-29
 
diff --git a/etc/nls/charmaps/DEC-MCS b/etc/nls/charmaps/DEC-MCS
index ac84ba5..f541f33 100644
--- a/etc/nls/charmaps/DEC-MCS
+++ b/etc/nls/charmaps/DEC-MCS
@@ -1,6 +1,27 @@
 <code_set_name> DEC-MCS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  VAX/VMS User's Manual, Order Number: AI-Y517A-TE, April 1986.
 
diff --git a/etc/nls/charmaps/DIN_66003 b/etc/nls/charmaps/DIN_66003
index b39bb4d..70b82a2 100644
--- a/etc/nls/charmaps/DIN_66003
+++ b/etc/nls/charmaps/DIN_66003
@@ -1,6 +1,27 @@
 <code_set_name> DIN_66003
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/DS_2089 b/etc/nls/charmaps/DS_2089
index 080b8cd..66ae5df 100644
--- a/etc/nls/charmaps/DS_2089
+++ b/etc/nls/charmaps/DS_2089
@@ -1,6 +1,27 @@
 <code_set_name> DS_2089
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: Danish Standard, DS 2089, February 1974
 
diff --git a/etc/nls/charmaps/EBCDIC-AT-DE b/etc/nls/charmaps/EBCDIC-AT-DE
index ce583ed..646c7f9 100644
--- a/etc/nls/charmaps/EBCDIC-AT-DE
+++ b/etc/nls/charmaps/EBCDIC-AT-DE
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-AT-DE
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-AT-DE-A b/etc/nls/charmaps/EBCDIC-AT-DE-A
index 5917d18..0fa64db 100644
--- a/etc/nls/charmaps/EBCDIC-AT-DE-A
+++ b/etc/nls/charmaps/EBCDIC-AT-DE-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-AT-DE-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-CA-FR b/etc/nls/charmaps/EBCDIC-CA-FR
index cf7962d..3643c67 100644
--- a/etc/nls/charmaps/EBCDIC-CA-FR
+++ b/etc/nls/charmaps/EBCDIC-CA-FR
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-CA-FR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-DK-NO b/etc/nls/charmaps/EBCDIC-DK-NO
index 7903685..4769011 100644
--- a/etc/nls/charmaps/EBCDIC-DK-NO
+++ b/etc/nls/charmaps/EBCDIC-DK-NO
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-DK-NO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/charmaps/EBCDIC-DK-NO-A b/etc/nls/charmaps/EBCDIC-DK-NO-A
index 606f157..a384e94 100644
--- a/etc/nls/charmaps/EBCDIC-DK-NO-A
+++ b/etc/nls/charmaps/EBCDIC-DK-NO-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-DK-NO-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-ES b/etc/nls/charmaps/EBCDIC-ES
index fd4e18d..1866bbe 100644
--- a/etc/nls/charmaps/EBCDIC-ES
+++ b/etc/nls/charmaps/EBCDIC-ES
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-ES-A b/etc/nls/charmaps/EBCDIC-ES-A
index 79e8894..d76bdbc 100644
--- a/etc/nls/charmaps/EBCDIC-ES-A
+++ b/etc/nls/charmaps/EBCDIC-ES-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-ES-S b/etc/nls/charmaps/EBCDIC-ES-S
index 84c4176..9b19a57 100644
--- a/etc/nls/charmaps/EBCDIC-ES-S
+++ b/etc/nls/charmaps/EBCDIC-ES-S
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES-S
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-FI-SE b/etc/nls/charmaps/EBCDIC-FI-SE
index 9e249a9..0b381d8 100644
--- a/etc/nls/charmaps/EBCDIC-FI-SE
+++ b/etc/nls/charmaps/EBCDIC-FI-SE
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FI-SE
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-FI-SE-A b/etc/nls/charmaps/EBCDIC-FI-SE-A
index 0149a81..a7a168f 100644
--- a/etc/nls/charmaps/EBCDIC-FI-SE-A
+++ b/etc/nls/charmaps/EBCDIC-FI-SE-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FI-SE-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-FR b/etc/nls/charmaps/EBCDIC-FR
index 77f285b..4122888 100644
--- a/etc/nls/charmaps/EBCDIC-FR
+++ b/etc/nls/charmaps/EBCDIC-FR
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-IS-FRISS b/etc/nls/charmaps/EBCDIC-IS-FRISS
index 4f20738..e679659 100644
--- a/etc/nls/charmaps/EBCDIC-IS-FRISS
+++ b/etc/nls/charmaps/EBCDIC-IS-FRISS
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-IS-FRISS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: Skyrsuvelar Rikisins og Reykjavikurborgar, feb 1982
 
diff --git a/etc/nls/charmaps/EBCDIC-IT b/etc/nls/charmaps/EBCDIC-IT
index dcea1d2..a4b31fa 100644
--- a/etc/nls/charmaps/EBCDIC-IT
+++ b/etc/nls/charmaps/EBCDIC-IT
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-PT b/etc/nls/charmaps/EBCDIC-PT
index 1a40b6f..b81c3af 100644
--- a/etc/nls/charmaps/EBCDIC-PT
+++ b/etc/nls/charmaps/EBCDIC-PT
@@ -1,3 +1,28 @@
+<comment_char> %
+<escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+CHARMAP
 <U0000>     /x00         NULL (NUL)
 <U0001>     /x01         START OF HEADING (SOH)
 <U0002>     /x02         START OF TEXT (STX)
diff --git a/etc/nls/charmaps/EBCDIC-UK b/etc/nls/charmaps/EBCDIC-UK
index cdf5588..0720b8b 100644
--- a/etc/nls/charmaps/EBCDIC-UK
+++ b/etc/nls/charmaps/EBCDIC-UK
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-UK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/EBCDIC-US b/etc/nls/charmaps/EBCDIC-US
index 107c8f8..e3fb24f 100644
--- a/etc/nls/charmaps/EBCDIC-US
+++ b/etc/nls/charmaps/EBCDIC-US
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-US
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
 
diff --git a/etc/nls/charmaps/ECMA-CYRILLIC b/etc/nls/charmaps/ECMA-CYRILLIC
index 39bbbbf..b502fd0 100644
--- a/etc/nls/charmaps/ECMA-CYRILLIC
+++ b/etc/nls/charmaps/ECMA-CYRILLIC
@@ -1,6 +1,27 @@
 <code_set_name> ECMA-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ES b/etc/nls/charmaps/ES
index 39f3777..91cc68b 100644
--- a/etc/nls/charmaps/ES
+++ b/etc/nls/charmaps/ES
@@ -1,6 +1,27 @@
 <code_set_name> ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ES2 b/etc/nls/charmaps/ES2
index 6200695..3ae103e 100644
--- a/etc/nls/charmaps/ES2
+++ b/etc/nls/charmaps/ES2
@@ -1,6 +1,27 @@
 <code_set_name> ES2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/EUC-JP b/etc/nls/charmaps/EUC-JP
index 691d4f6..5e690e1 100644
--- a/etc/nls/charmaps/EUC-JP
+++ b/etc/nls/charmaps/EUC-JP
@@ -3,6 +3,27 @@
 <escape_char> /
 <mb_cur_min> 1
 <mb_cur_max> 3
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % EUC-JP character map
 % Ulrich Drepper <drepper@redhat.com>, 2000.
diff --git a/etc/nls/charmaps/EUC-KR b/etc/nls/charmaps/EUC-KR
index 9957c44..4b81ecb 100644
--- a/etc/nls/charmaps/EUC-KR
+++ b/etc/nls/charmaps/EUC-KR
@@ -3,6 +3,27 @@
 <escape_char> /
 <mb_cur_max> 2
 <mb_cur_min> 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 CHARMAP
 %
diff --git a/etc/nls/charmaps/EUC-TW b/etc/nls/charmaps/EUC-TW
index 6620111..e36687d 100644
--- a/etc/nls/charmaps/EUC-TW
+++ b/etc/nls/charmaps/EUC-TW
@@ -3,6 +3,27 @@
 <escape_char> /
 <mb_cur_max> 4
 <mb_cur_min> 1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 CHARMAP
 <U0000>     /x00             NULL (NUL)
diff --git a/etc/nls/charmaps/GB18030 b/etc/nls/charmaps/GB18030
index bd698ab..9ad99c7 100644
--- a/etc/nls/charmaps/GB18030
+++ b/etc/nls/charmaps/GB18030
@@ -3,6 +3,27 @@
 <escape_char> /
 <mb_cur_min> 1
 <mb_cur_max> 4
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 CHARMAP
 <U0000>		/x00		<control>
diff --git a/etc/nls/charmaps/GB2312 b/etc/nls/charmaps/GB2312
index 40bd3a2..8a99c24 100644
--- a/etc/nls/charmaps/GB2312
+++ b/etc/nls/charmaps/GB2312
@@ -4,6 +4,27 @@
 <comment_char> %
 <escape_char> /
 % Chinese charmap for EUC-CN = GB2312 = union of ASCII and GB_2312-80
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % Contact: ha_shao
 % Email: hashao@china.com
diff --git a/etc/nls/charmaps/GBK b/etc/nls/charmaps/GBK
index c7f9125..8512b32 100644
--- a/etc/nls/charmaps/GBK
+++ b/etc/nls/charmaps/GBK
@@ -3,6 +3,27 @@
 <mb_cur_min> 1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 CHARMAP
 <U0000>     /x00         NULL (NUL)
diff --git a/etc/nls/charmaps/GB_1988-80 b/etc/nls/charmaps/GB_1988-80
index 313c2aa..f890a2d 100644
--- a/etc/nls/charmaps/GB_1988-80
+++ b/etc/nls/charmaps/GB_1988-80
@@ -1,6 +1,27 @@
 <code_set_name> GB_1988-80
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/GEORGIAN-ACADEMY b/etc/nls/charmaps/GEORGIAN-ACADEMY
index 9dc1bc9..fbdceb9 100644
--- a/etc/nls/charmaps/GEORGIAN-ACADEMY
+++ b/etc/nls/charmaps/GEORGIAN-ACADEMY
@@ -1,6 +1,27 @@
 <code_set_name> GEORGIAN-ACADEMY
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 CHARMAP
 <U0000>     /x00         NULL (NUL)
diff --git a/etc/nls/charmaps/GEORGIAN-PS b/etc/nls/charmaps/GEORGIAN-PS
index 64615ff..4bb5245 100644
--- a/etc/nls/charmaps/GEORGIAN-PS
+++ b/etc/nls/charmaps/GEORGIAN-PS
@@ -1,6 +1,27 @@
 <code_set_name> GEORGIAN-PS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 CHARMAP
 <U0000>     /x00         NULL (NUL)
diff --git a/etc/nls/charmaps/GOST_19768-74 b/etc/nls/charmaps/GOST_19768-74
index 731f471..c4b1941 100644
--- a/etc/nls/charmaps/GOST_19768-74
+++ b/etc/nls/charmaps/GOST_19768-74
@@ -1,6 +1,27 @@
 <code_set_name> GOST_19768-74
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/GREEK-CCITT b/etc/nls/charmaps/GREEK-CCITT
index 82ab9ff..a627428 100644
--- a/etc/nls/charmaps/GREEK-CCITT
+++ b/etc/nls/charmaps/GREEK-CCITT
@@ -1,6 +1,27 @@
 <code_set_name> GREEK-CCITT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/GREEK7 b/etc/nls/charmaps/GREEK7
index db74d60..1673e25 100644
--- a/etc/nls/charmaps/GREEK7
+++ b/etc/nls/charmaps/GREEK7
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/GREEK7-OLD b/etc/nls/charmaps/GREEK7-OLD
index 960036f..7ef9543 100644
--- a/etc/nls/charmaps/GREEK7-OLD
+++ b/etc/nls/charmaps/GREEK7-OLD
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7-OLD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/HP-ROMAN8 b/etc/nls/charmaps/HP-ROMAN8
index 5334e89..89aad2b 100644
--- a/etc/nls/charmaps/HP-ROMAN8
+++ b/etc/nls/charmaps/HP-ROMAN8
@@ -1,6 +1,27 @@
 <code_set_name> HP-ROMAN8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: LaserJet IIP Printer User's Manual,
 
diff --git a/etc/nls/charmaps/IBM037 b/etc/nls/charmaps/IBM037
index 04561e1..e32afcc 100644
--- a/etc/nls/charmaps/IBM037
+++ b/etc/nls/charmaps/IBM037
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM038 b/etc/nls/charmaps/IBM038
index 5f23771..2e25077 100644
--- a/etc/nls/charmaps/IBM038
+++ b/etc/nls/charmaps/IBM038
@@ -1,6 +1,27 @@
 <code_set_name> IBM038
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
 
diff --git a/etc/nls/charmaps/IBM1004 b/etc/nls/charmaps/IBM1004
index aa86fb0..12dea9f 100644
--- a/etc/nls/charmaps/IBM1004
+++ b/etc/nls/charmaps/IBM1004
@@ -1,6 +1,27 @@
 <code_set_name> IBM1004
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: CEN/TC304 N283, 1994-02-04
 
diff --git a/etc/nls/charmaps/IBM1026 b/etc/nls/charmaps/IBM1026
index 5dbb198..078fff3 100644
--- a/etc/nls/charmaps/IBM1026
+++ b/etc/nls/charmaps/IBM1026
@@ -1,6 +1,27 @@
 <code_set_name> IBM1026
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM1047 b/etc/nls/charmaps/IBM1047
index 5123851..506a440 100644
--- a/etc/nls/charmaps/IBM1047
+++ b/etc/nls/charmaps/IBM1047
@@ -1,6 +1,27 @@
 <code_set_name> IBM1047
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM Character Data Representation Architecture
 
diff --git a/etc/nls/charmaps/IBM256 b/etc/nls/charmaps/IBM256
index 5cfd2db..ab46c96 100644
--- a/etc/nls/charmaps/IBM256
+++ b/etc/nls/charmaps/IBM256
@@ -1,6 +1,27 @@
 <code_set_name> IBM256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM Registry C-H 3-3220-050
 
diff --git a/etc/nls/charmaps/IBM273 b/etc/nls/charmaps/IBM273
index c3f70e2..71e9c75 100644
--- a/etc/nls/charmaps/IBM273
+++ b/etc/nls/charmaps/IBM273
@@ -1,6 +1,27 @@
 <code_set_name> IBM273
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM274 b/etc/nls/charmaps/IBM274
index 44525ba..b43599b 100644
--- a/etc/nls/charmaps/IBM274
+++ b/etc/nls/charmaps/IBM274
@@ -1,6 +1,27 @@
 <code_set_name> IBM274
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
 
diff --git a/etc/nls/charmaps/IBM275 b/etc/nls/charmaps/IBM275
index 1fe31c1..69670dc 100644
--- a/etc/nls/charmaps/IBM275
+++ b/etc/nls/charmaps/IBM275
@@ -1,6 +1,27 @@
 <code_set_name> IBM275
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM277 b/etc/nls/charmaps/IBM277
index 1c0b5cb..83e35e5 100644
--- a/etc/nls/charmaps/IBM277
+++ b/etc/nls/charmaps/IBM277
@@ -1,6 +1,27 @@
 <code_set_name> IBM277
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM278 b/etc/nls/charmaps/IBM278
index 6469615..ecad8e7 100644
--- a/etc/nls/charmaps/IBM278
+++ b/etc/nls/charmaps/IBM278
@@ -1,6 +1,27 @@
 <code_set_name> IBM278
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM280 b/etc/nls/charmaps/IBM280
index 5de3b3e..5dfbffe 100644
--- a/etc/nls/charmaps/IBM280
+++ b/etc/nls/charmaps/IBM280
@@ -1,6 +1,27 @@
 <code_set_name> IBM280
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM281 b/etc/nls/charmaps/IBM281
index a2c3e1f..445a6e3 100644
--- a/etc/nls/charmaps/IBM281
+++ b/etc/nls/charmaps/IBM281
@@ -1,6 +1,27 @@
 <code_set_name> IBM281
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
 
diff --git a/etc/nls/charmaps/IBM284 b/etc/nls/charmaps/IBM284
index c64b2a6..5c0a17a 100644
--- a/etc/nls/charmaps/IBM284
+++ b/etc/nls/charmaps/IBM284
@@ -1,6 +1,27 @@
 <code_set_name> IBM284
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM285 b/etc/nls/charmaps/IBM285
index 1f5a942..6a9fc1b 100644
--- a/etc/nls/charmaps/IBM285
+++ b/etc/nls/charmaps/IBM285
@@ -1,6 +1,27 @@
 <code_set_name> IBM285
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM290 b/etc/nls/charmaps/IBM290
index da325ed..6677372 100644
--- a/etc/nls/charmaps/IBM290
+++ b/etc/nls/charmaps/IBM290
@@ -1,6 +1,27 @@
 <code_set_name> IBM290
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
 
diff --git a/etc/nls/charmaps/IBM297 b/etc/nls/charmaps/IBM297
index 33b74ee..cabc8da 100644
--- a/etc/nls/charmaps/IBM297
+++ b/etc/nls/charmaps/IBM297
@@ -1,6 +1,27 @@
 <code_set_name> IBM297
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM420 b/etc/nls/charmaps/IBM420
index a73b6e6..d54664a 100644
--- a/etc/nls/charmaps/IBM420
+++ b/etc/nls/charmaps/IBM420
@@ -1,6 +1,27 @@
 <code_set_name> IBM420
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM423 b/etc/nls/charmaps/IBM423
index e8626f4..8a23d28 100644
--- a/etc/nls/charmaps/IBM423
+++ b/etc/nls/charmaps/IBM423
@@ -1,6 +1,27 @@
 <code_set_name> IBM423
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM424 b/etc/nls/charmaps/IBM424
index 883e43b..2fa9edb 100644
--- a/etc/nls/charmaps/IBM424
+++ b/etc/nls/charmaps/IBM424
@@ -1,6 +1,27 @@
 <code_set_name> IBM424
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM437 b/etc/nls/charmaps/IBM437
index f42377b..8d45173 100644
--- a/etc/nls/charmaps/IBM437
+++ b/etc/nls/charmaps/IBM437
@@ -1,6 +1,27 @@
 <code_set_name> IBM437
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM500 b/etc/nls/charmaps/IBM500
index 44e5cc6..7f39091 100644
--- a/etc/nls/charmaps/IBM500
+++ b/etc/nls/charmaps/IBM500
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM850 b/etc/nls/charmaps/IBM850
index 10212bf..61ed2bb 100644
--- a/etc/nls/charmaps/IBM850
+++ b/etc/nls/charmaps/IBM850
@@ -1,6 +1,27 @@
 <code_set_name> IBM850
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM851 b/etc/nls/charmaps/IBM851
index 0ec54f1..150b2d1 100644
--- a/etc/nls/charmaps/IBM851
+++ b/etc/nls/charmaps/IBM851
@@ -1,6 +1,27 @@
 <code_set_name> IBM851
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM852 b/etc/nls/charmaps/IBM852
index 6532916..cd343a0 100644
--- a/etc/nls/charmaps/IBM852
+++ b/etc/nls/charmaps/IBM852
@@ -1,6 +1,27 @@
 <code_set_name> IBM852
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM855 b/etc/nls/charmaps/IBM855
index 63613d6..f00b3bc 100644
--- a/etc/nls/charmaps/IBM855
+++ b/etc/nls/charmaps/IBM855
@@ -1,6 +1,27 @@
 <code_set_name> IBM855
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM857 b/etc/nls/charmaps/IBM857
index 7b2a321..0029cd0 100644
--- a/etc/nls/charmaps/IBM857
+++ b/etc/nls/charmaps/IBM857
@@ -1,6 +1,27 @@
 <code_set_name> IBM857
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM860 b/etc/nls/charmaps/IBM860
index 9ccc752..5bef37d 100644
--- a/etc/nls/charmaps/IBM860
+++ b/etc/nls/charmaps/IBM860
@@ -1,6 +1,27 @@
 <code_set_name> IBM860
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM861 b/etc/nls/charmaps/IBM861
index a209f8f..ebe9788 100644
--- a/etc/nls/charmaps/IBM861
+++ b/etc/nls/charmaps/IBM861
@@ -1,6 +1,27 @@
 <code_set_name> IBM861
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM862 b/etc/nls/charmaps/IBM862
index 86bea73..ec8a3d0 100644
--- a/etc/nls/charmaps/IBM862
+++ b/etc/nls/charmaps/IBM862
@@ -1,6 +1,27 @@
 <code_set_name> IBM862
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM863 b/etc/nls/charmaps/IBM863
index 1e1012b..17bc0b3 100644
--- a/etc/nls/charmaps/IBM863
+++ b/etc/nls/charmaps/IBM863
@@ -1,6 +1,27 @@
 <code_set_name> IBM863
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
 
diff --git a/etc/nls/charmaps/IBM864 b/etc/nls/charmaps/IBM864
index 3115aa7..4128a99 100644
--- a/etc/nls/charmaps/IBM864
+++ b/etc/nls/charmaps/IBM864
@@ -1,6 +1,27 @@
 <code_set_name> IBM864
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 % alias CP864
diff --git a/etc/nls/charmaps/IBM865 b/etc/nls/charmaps/IBM865
index 08b5618..fa688f5 100644
--- a/etc/nls/charmaps/IBM865
+++ b/etc/nls/charmaps/IBM865
@@ -1,6 +1,27 @@
 <code_set_name> IBM865
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987)
 
diff --git a/etc/nls/charmaps/IBM866 b/etc/nls/charmaps/IBM866
index 603f6cc..1752ac0 100644
--- a/etc/nls/charmaps/IBM866
+++ b/etc/nls/charmaps/IBM866
@@ -1,6 +1,27 @@
 <code_set_name> IBM866
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 % alias CP866
diff --git a/etc/nls/charmaps/IBM868 b/etc/nls/charmaps/IBM868
index e2c5545..74ffc74 100644
--- a/etc/nls/charmaps/IBM868
+++ b/etc/nls/charmaps/IBM868
@@ -1,6 +1,27 @@
 <code_set_name> IBM868
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM869 b/etc/nls/charmaps/IBM869
index 6d45f35..572eb9b 100644
--- a/etc/nls/charmaps/IBM869
+++ b/etc/nls/charmaps/IBM869
@@ -1,6 +1,27 @@
 <code_set_name> IBM869
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
 
diff --git a/etc/nls/charmaps/IBM870 b/etc/nls/charmaps/IBM870
index 3e039ea..996a288 100644
--- a/etc/nls/charmaps/IBM870
+++ b/etc/nls/charmaps/IBM870
@@ -1,6 +1,27 @@
 <code_set_name> IBM870
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM871 b/etc/nls/charmaps/IBM871
index 540f693..215e6ad 100644
--- a/etc/nls/charmaps/IBM871
+++ b/etc/nls/charmaps/IBM871
@@ -1,6 +1,27 @@
 <code_set_name> IBM871
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM874 b/etc/nls/charmaps/IBM874
index 6359f78..ce70285 100644
--- a/etc/nls/charmaps/IBM874
+++ b/etc/nls/charmaps/IBM874
@@ -1,6 +1,27 @@
 <code_set_name> IBM874
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 % alias CP874
diff --git a/etc/nls/charmaps/IBM875 b/etc/nls/charmaps/IBM875
index 7bacde6..582c735 100644
--- a/etc/nls/charmaps/IBM875
+++ b/etc/nls/charmaps/IBM875
@@ -1,6 +1,27 @@
 <code_set_name> IBM875
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: UNICODE 1.0
 
diff --git a/etc/nls/charmaps/IBM880 b/etc/nls/charmaps/IBM880
index c7ab4cf..7fe9dd3 100644
--- a/etc/nls/charmaps/IBM880
+++ b/etc/nls/charmaps/IBM880
@@ -1,6 +1,27 @@
 <code_set_name> IBM880
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM891 b/etc/nls/charmaps/IBM891
index ed3fefc..3266d5f 100644
--- a/etc/nls/charmaps/IBM891
+++ b/etc/nls/charmaps/IBM891
@@ -1,6 +1,27 @@
 <code_set_name> IBM891
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM903 b/etc/nls/charmaps/IBM903
index 6fa1f21..7cf2345 100644
--- a/etc/nls/charmaps/IBM903
+++ b/etc/nls/charmaps/IBM903
@@ -1,6 +1,27 @@
 <code_set_name> IBM903
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM904 b/etc/nls/charmaps/IBM904
index 91d5ed2..06450c4 100644
--- a/etc/nls/charmaps/IBM904
+++ b/etc/nls/charmaps/IBM904
@@ -1,6 +1,27 @@
 <code_set_name> IBM904
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IBM905 b/etc/nls/charmaps/IBM905
index b502ad0..7aec92c 100644
--- a/etc/nls/charmaps/IBM905
+++ b/etc/nls/charmaps/IBM905
@@ -1,6 +1,27 @@
 <code_set_name> IBM905
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
 
diff --git a/etc/nls/charmaps/IBM918 b/etc/nls/charmaps/IBM918
index 7ad2651..848a034 100644
--- a/etc/nls/charmaps/IBM918
+++ b/etc/nls/charmaps/IBM918
@@ -1,6 +1,27 @@
 <code_set_name> IBM918
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
 
diff --git a/etc/nls/charmaps/IEC_P27-1 b/etc/nls/charmaps/IEC_P27-1
index 53d66fc..78f7190 100644
--- a/etc/nls/charmaps/IEC_P27-1
+++ b/etc/nls/charmaps/IEC_P27-1
@@ -1,6 +1,27 @@
 <code_set_name> IEC_P27-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/INIS b/etc/nls/charmaps/INIS
index a4100b7..718bce6 100644
--- a/etc/nls/charmaps/INIS
+++ b/etc/nls/charmaps/INIS
@@ -1,6 +1,27 @@
 <code_set_name> INIS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/INIS-8 b/etc/nls/charmaps/INIS-8
index 34ea524..60ba000 100644
--- a/etc/nls/charmaps/INIS-8
+++ b/etc/nls/charmaps/INIS-8
@@ -1,6 +1,27 @@
 <code_set_name> INIS-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/INIS-CYRILLIC b/etc/nls/charmaps/INIS-CYRILLIC
index 226e7f0..9c2825f 100644
--- a/etc/nls/charmaps/INIS-CYRILLIC
+++ b/etc/nls/charmaps/INIS-CYRILLIC
@@ -1,6 +1,27 @@
 <code_set_name> INIS-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/INVARIANT b/etc/nls/charmaps/INVARIANT
index 5371de5..10b04ae 100644
--- a/etc/nls/charmaps/INVARIANT
+++ b/etc/nls/charmaps/INVARIANT
@@ -1,6 +1,27 @@
 <code_set_name> INVARIANT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % alias ISO-IR-170
 CHARMAP
diff --git a/etc/nls/charmaps/ISIRI-3342 b/etc/nls/charmaps/ISIRI-3342
index 3dd589f..169d932 100644
--- a/etc/nls/charmaps/ISIRI-3342
+++ b/etc/nls/charmaps/ISIRI-3342
@@ -1,6 +1,27 @@
 <code_set_name> ISIRI-3342
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 0.0
 % source: Iranian standard ISIRI 3342 (1993)
 % author: Pablo Saratxaga, and Roozbeh Pournader
diff --git a/etc/nls/charmaps/ISO-8859-1 b/etc/nls/charmaps/ISO-8859-1
index 673c0ed..f9bfec4 100644
--- a/etc/nls/charmaps/ISO-8859-1
+++ b/etc/nls/charmaps/ISO-8859-1
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-10 b/etc/nls/charmaps/ISO-8859-10
index 7f3010d..dd93fa7 100644
--- a/etc/nls/charmaps/ISO-8859-10
+++ b/etc/nls/charmaps/ISO-8859-10
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-13 b/etc/nls/charmaps/ISO-8859-13
index 3a09e37..9aa638b 100644
--- a/etc/nls/charmaps/ISO-8859-13
+++ b/etc/nls/charmaps/ISO-8859-13
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-13
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 % alias ISO-IR-179
diff --git a/etc/nls/charmaps/ISO-8859-14 b/etc/nls/charmaps/ISO-8859-14
index ab9e8f3..95deb8e 100644
--- a/etc/nls/charmaps/ISO-8859-14
+++ b/etc/nls/charmaps/ISO-8859-14
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-14
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 % alias LATIN8
diff --git a/etc/nls/charmaps/ISO-8859-15 b/etc/nls/charmaps/ISO-8859-15
index 0e15867..609524c 100644
--- a/etc/nls/charmaps/ISO-8859-15
+++ b/etc/nls/charmaps/ISO-8859-15
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-15
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 CHARMAP
diff --git a/etc/nls/charmaps/ISO-8859-16 b/etc/nls/charmaps/ISO-8859-16
index 83fdeb7..7d521e5 100644
--- a/etc/nls/charmaps/ISO-8859-16
+++ b/etc/nls/charmaps/ISO-8859-16
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-16
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 % alias ISO-IR-226
diff --git a/etc/nls/charmaps/ISO-8859-2 b/etc/nls/charmaps/ISO-8859-2
index 136aec8..f9c2ae0 100644
--- a/etc/nls/charmaps/ISO-8859-2
+++ b/etc/nls/charmaps/ISO-8859-2
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-3 b/etc/nls/charmaps/ISO-8859-3
index f0817ca..ada7e6f 100644
--- a/etc/nls/charmaps/ISO-8859-3
+++ b/etc/nls/charmaps/ISO-8859-3
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-4 b/etc/nls/charmaps/ISO-8859-4
index 76843e8..c34d8d2 100644
--- a/etc/nls/charmaps/ISO-8859-4
+++ b/etc/nls/charmaps/ISO-8859-4
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-5 b/etc/nls/charmaps/ISO-8859-5
index 5266bcd..09d77ec 100644
--- a/etc/nls/charmaps/ISO-8859-5
+++ b/etc/nls/charmaps/ISO-8859-5
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-5
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-6 b/etc/nls/charmaps/ISO-8859-6
index 60d5881..b54b1dd 100644
--- a/etc/nls/charmaps/ISO-8859-6
+++ b/etc/nls/charmaps/ISO-8859-6
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-7 b/etc/nls/charmaps/ISO-8859-7
index 7589e37..1b6a93b 100644
--- a/etc/nls/charmaps/ISO-8859-7
+++ b/etc/nls/charmaps/ISO-8859-7
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-8 b/etc/nls/charmaps/ISO-8859-8
index f6ea50b..4f7c884 100644
--- a/etc/nls/charmaps/ISO-8859-8
+++ b/etc/nls/charmaps/ISO-8859-8
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-8859-9 b/etc/nls/charmaps/ISO-8859-9
index e4d35b1..ad4958f 100644
--- a/etc/nls/charmaps/ISO-8859-9
+++ b/etc/nls/charmaps/ISO-8859-9
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO-IR-197 b/etc/nls/charmaps/ISO-IR-197
index 4334077..23b0f59 100644
--- a/etc/nls/charmaps/ISO-IR-197
+++ b/etc/nls/charmaps/ISO-IR-197
@@ -1,6 +1,27 @@
 <code_set_name> ISO-IR-197
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % source:  http://www.itek.norut.no/project/barent/barsek/ip/197t.html
 % author:  Petter Reinholdtsen <pere@td.org.uit.no>
 % date:    1998-08-31
diff --git a/etc/nls/charmaps/ISO-IR-209 b/etc/nls/charmaps/ISO-IR-209
index 0f88e26..11e1b1c 100644
--- a/etc/nls/charmaps/ISO-IR-209
+++ b/etc/nls/charmaps/ISO-IR-209
@@ -1,6 +1,27 @@
 <code_set_name> ISO-IR-209
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % source:  http://www.itscj.ipsj.or.jp/ISO-IR/209.pdf
 % author:  Regnor Jernsletten <Regnor.Jernsletten@sami.uit.no>
 % date:    2001-07-31
diff --git a/etc/nls/charmaps/ISO-IR-90 b/etc/nls/charmaps/ISO-IR-90
index a2a2a81..4e9f0cc 100644
--- a/etc/nls/charmaps/ISO-IR-90
+++ b/etc/nls/charmaps/ISO-IR-90
@@ -1,6 +1,27 @@
 <code_set_name> ISO-IR-90
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO_10367-BOX b/etc/nls/charmaps/ISO_10367-BOX
index ea74874..c4479d4 100644
--- a/etc/nls/charmaps/ISO_10367-BOX
+++ b/etc/nls/charmaps/ISO_10367-BOX
@@ -1,6 +1,27 @@
 <code_set_name> ISO_10367-BOX
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO_10646 b/etc/nls/charmaps/ISO_10646
index cbe8a63..700ed4c 100644
--- a/etc/nls/charmaps/ISO_10646
+++ b/etc/nls/charmaps/ISO_10646
@@ -1,5 +1,26 @@
 <escape_char> /
 <comment_char> %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % ISO/IEC 10646-1:1993 charmap with mnemonic,ds symbolnames
 % Only a part of the 10646 encoding is tabled here
diff --git a/etc/nls/charmaps/ISO_2033-1983 b/etc/nls/charmaps/ISO_2033-1983
index 398bb24..b2627af 100644
--- a/etc/nls/charmaps/ISO_2033-1983
+++ b/etc/nls/charmaps/ISO_2033-1983
@@ -1,6 +1,27 @@
 <code_set_name> ISO_2033-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/ISO_5427 b/etc/nls/charmaps/ISO_5427
index 1fb5064..c77b7d8 100644
--- a/etc/nls/charmaps/ISO_5427
+++ b/etc/nls/charmaps/ISO_5427
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO_5427-EXT b/etc/nls/charmaps/ISO_5427-EXT
index 7689a5b..7c348ce 100644
--- a/etc/nls/charmaps/ISO_5427-EXT
+++ b/etc/nls/charmaps/ISO_5427-EXT
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427-EXT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/ISO_5428 b/etc/nls/charmaps/ISO_5428
index b2600bd..c30958f 100644
--- a/etc/nls/charmaps/ISO_5428
+++ b/etc/nls/charmaps/ISO_5428
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5428
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO_646.BASIC b/etc/nls/charmaps/ISO_646.BASIC
index 34f8437..320e66d 100644
--- a/etc/nls/charmaps/ISO_646.BASIC
+++ b/etc/nls/charmaps/ISO_646.BASIC
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.BASIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO_646.IRV b/etc/nls/charmaps/ISO_646.IRV
index 9197ea6..2dc21ec 100644
--- a/etc/nls/charmaps/ISO_646.IRV
+++ b/etc/nls/charmaps/ISO_646.IRV
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.IRV
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO_6937 b/etc/nls/charmaps/ISO_6937
index 28c9105..2e174ce 100644
--- a/etc/nls/charmaps/ISO_6937
+++ b/etc/nls/charmaps/ISO_6937
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry and ISO/IEC 6937:1992
 
diff --git a/etc/nls/charmaps/ISO_6937-2-25 b/etc/nls/charmaps/ISO_6937-2-25
index e601c8d..0208bf0 100644
--- a/etc/nls/charmaps/ISO_6937-2-25
+++ b/etc/nls/charmaps/ISO_6937-2-25
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-25
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/ISO_6937-2-ADD b/etc/nls/charmaps/ISO_6937-2-ADD
index f230be3..3d14083 100644
--- a/etc/nls/charmaps/ISO_6937-2-ADD
+++ b/etc/nls/charmaps/ISO_6937-2-ADD
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry and ISO 6937-2:1983
 
diff --git a/etc/nls/charmaps/ISO_8859-1,GL b/etc/nls/charmaps/ISO_8859-1,GL
index 62d13d9..cd52e02 100644
--- a/etc/nls/charmaps/ISO_8859-1,GL
+++ b/etc/nls/charmaps/ISO_8859-1,GL
@@ -1,3 +1,24 @@
+#########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  License); you may  not use  this file  
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+#########################################################################
 # For use with several test collation definitions, I have produced an
 # 8859.1 charmap, using the standard names in 10646 and related standards.
 # The exceptions are that the "LATIN CAPITAL LETTER A" has been shorted
diff --git a/etc/nls/charmaps/ISO_8859-SUPP b/etc/nls/charmaps/ISO_8859-SUPP
index 52a6b68..79e1bf4 100644
--- a/etc/nls/charmaps/ISO_8859-SUPP
+++ b/etc/nls/charmaps/ISO_8859-SUPP
@@ -1,6 +1,27 @@
 <code_set_name> ISO_8859-SUPP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/IT b/etc/nls/charmaps/IT
index fe1728d..dbfc459 100644
--- a/etc/nls/charmaps/IT
+++ b/etc/nls/charmaps/IT
@@ -1,6 +1,27 @@
 <code_set_name> IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/JIS_C6220-1969-JP b/etc/nls/charmaps/JIS_C6220-1969-JP
index 2044d0c..432772b 100644
--- a/etc/nls/charmaps/JIS_C6220-1969-JP
+++ b/etc/nls/charmaps/JIS_C6220-1969-JP
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-JP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/JIS_C6220-1969-RO b/etc/nls/charmaps/JIS_C6220-1969-RO
index 4aefeca..a175997 100644
--- a/etc/nls/charmaps/JIS_C6220-1969-RO
+++ b/etc/nls/charmaps/JIS_C6220-1969-RO
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-RO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/JIS_C6229-1984-A b/etc/nls/charmaps/JIS_C6229-1984-A
index 7d77a6c..b8f26b7 100644
--- a/etc/nls/charmaps/JIS_C6229-1984-A
+++ b/etc/nls/charmaps/JIS_C6229-1984-A
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/JIS_C6229-1984-B b/etc/nls/charmaps/JIS_C6229-1984-B
index 3d30743..741b0ae 100644
--- a/etc/nls/charmaps/JIS_C6229-1984-B
+++ b/etc/nls/charmaps/JIS_C6229-1984-B
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/JIS_C6229-1984-B-ADD b/etc/nls/charmaps/JIS_C6229-1984-B-ADD
index 8c7c383..47b368c 100644
--- a/etc/nls/charmaps/JIS_C6229-1984-B-ADD
+++ b/etc/nls/charmaps/JIS_C6229-1984-B-ADD
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/JIS_C6229-1984-HAND b/etc/nls/charmaps/JIS_C6229-1984-HAND
index 5b4be9e..3d76dcd 100644
--- a/etc/nls/charmaps/JIS_C6229-1984-HAND
+++ b/etc/nls/charmaps/JIS_C6229-1984-HAND
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/JIS_C6229-1984-HAND-ADD b/etc/nls/charmaps/JIS_C6229-1984-HAND-ADD
index 0e494a7..5a91e7d 100644
--- a/etc/nls/charmaps/JIS_C6229-1984-HAND-ADD
+++ b/etc/nls/charmaps/JIS_C6229-1984-HAND-ADD
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/JIS_C6229-1984-KANA b/etc/nls/charmaps/JIS_C6229-1984-KANA
index 80a3a92..3f8ebe5 100644
--- a/etc/nls/charmaps/JIS_C6229-1984-KANA
+++ b/etc/nls/charmaps/JIS_C6229-1984-KANA
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-KANA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/JIS_X0201 b/etc/nls/charmaps/JIS_X0201
index d0e78c6..4c83042 100644
--- a/etc/nls/charmaps/JIS_X0201
+++ b/etc/nls/charmaps/JIS_X0201
@@ -1,6 +1,27 @@
 <code_set_name> JIS_X0201
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % alias X0201
 CHARMAP
diff --git a/etc/nls/charmaps/JOHAB b/etc/nls/charmaps/JOHAB
index ff6e325..619d914 100644
--- a/etc/nls/charmaps/JOHAB
+++ b/etc/nls/charmaps/JOHAB
@@ -3,6 +3,27 @@
 <escape_char> /
 <mb_cur_min> 1
 <mb_cur_max> 2
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % Generated from the mappings/eastasia/johab.txt from the Unicode CDROM.
 
 CHARMAP
diff --git a/etc/nls/charmaps/JUS_I.B1.002 b/etc/nls/charmaps/JUS_I.B1.002
index 4219602..ba3ab6b 100644
--- a/etc/nls/charmaps/JUS_I.B1.002
+++ b/etc/nls/charmaps/JUS_I.B1.002
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.002
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/JUS_I.B1.003-MAC b/etc/nls/charmaps/JUS_I.B1.003-MAC
index 72042b0..94ac850 100644
--- a/etc/nls/charmaps/JUS_I.B1.003-MAC
+++ b/etc/nls/charmaps/JUS_I.B1.003-MAC
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-MAC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/JUS_I.B1.003-SERB b/etc/nls/charmaps/JUS_I.B1.003-SERB
index 1ecad43..c1fa62f 100644
--- a/etc/nls/charmaps/JUS_I.B1.003-SERB
+++ b/etc/nls/charmaps/JUS_I.B1.003-SERB
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-SERB
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/KOI-8 b/etc/nls/charmaps/KOI-8
index 63d6218..7c42bba 100644
--- a/etc/nls/charmaps/KOI-8
+++ b/etc/nls/charmaps/KOI-8
@@ -1,6 +1,27 @@
 <code_set_name> KOI-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: Andrey A. Chernov <ache@astral.msk.su>
 
diff --git a/etc/nls/charmaps/KOI8-R b/etc/nls/charmaps/KOI8-R
index 7788ce5..627a8b2 100644
--- a/etc/nls/charmaps/KOI8-R
+++ b/etc/nls/charmaps/KOI8-R
@@ -1,6 +1,27 @@
 <code_set_name> KOI8-R
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: RFC1489 via Gabor Kiss <kissg@sztaki.hu>
 
diff --git a/etc/nls/charmaps/KOI8-T b/etc/nls/charmaps/KOI8-T
index 9738961..0611bb3 100644
--- a/etc/nls/charmaps/KOI8-T
+++ b/etc/nls/charmaps/KOI8-T
@@ -1,6 +1,27 @@
 <code_set_name> KOI8-T
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Author: Michael Davis <tajik_fonts@iname.com>
 % URL:    http://www.traveltajikistan.com/fonts
diff --git a/etc/nls/charmaps/KOI8-U b/etc/nls/charmaps/KOI8-U
index 6390046..08da492 100644
--- a/etc/nls/charmaps/KOI8-U
+++ b/etc/nls/charmaps/KOI8-U
@@ -1,6 +1,27 @@
 <code_set_name> KOI8-U
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.1
 %  source: RFC 2319
 %  source: http://www.net.ua/KOI8-U/
diff --git a/etc/nls/charmaps/KSC5636 b/etc/nls/charmaps/KSC5636
index 41f0d28..75b0baf 100644
--- a/etc/nls/charmaps/KSC5636
+++ b/etc/nls/charmaps/KSC5636
@@ -1,6 +1,27 @@
 <code_set_name> KSC5636
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % alias ISO646-KR
 CHARMAP
diff --git a/etc/nls/charmaps/LATIN-GREEK b/etc/nls/charmaps/LATIN-GREEK
index 26c6349..109f67e 100644
--- a/etc/nls/charmaps/LATIN-GREEK
+++ b/etc/nls/charmaps/LATIN-GREEK
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/LATIN-GREEK-1 b/etc/nls/charmaps/LATIN-GREEK-1
index 69413c3..a7d9125 100644
--- a/etc/nls/charmaps/LATIN-GREEK-1
+++ b/etc/nls/charmaps/LATIN-GREEK-1
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/MAC-CYRILLIC b/etc/nls/charmaps/MAC-CYRILLIC
index 482cfd4..ed285e0 100644
--- a/etc/nls/charmaps/MAC-CYRILLIC
+++ b/etc/nls/charmaps/MAC-CYRILLIC
@@ -1,6 +1,27 @@
 <code_set_name> MAC-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % alias CP10007
 CHARMAP
diff --git a/etc/nls/charmaps/MAC-IS b/etc/nls/charmaps/MAC-IS
index 835a49c..8151444 100644
--- a/etc/nls/charmaps/MAC-IS
+++ b/etc/nls/charmaps/MAC-IS
@@ -1,6 +1,27 @@
 <code_set_name> MAC-IS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 CHARMAP
 <U0000>     /x00         NULL (NUL)
diff --git a/etc/nls/charmaps/MAC-SAMI b/etc/nls/charmaps/MAC-SAMI
index b2b2a07..0eb2d99 100644
--- a/etc/nls/charmaps/MAC-SAMI
+++ b/etc/nls/charmaps/MAC-SAMI
@@ -1,6 +1,27 @@
 <code_set_name> MAC-SAMI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % source:  http://www.indigo.ie/egt/standards/se/mac-sami.html
 % author:  Regnor Jernsletten <Regnor.Jernsletten@sami.uit.no>
 % date:    2001-07-31
diff --git a/etc/nls/charmaps/MAC-UK b/etc/nls/charmaps/MAC-UK
index f9da2dd..cf970a7 100644
--- a/etc/nls/charmaps/MAC-UK
+++ b/etc/nls/charmaps/MAC-UK
@@ -1,6 +1,27 @@
 <code_set_name> MAC-UK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % automatically generated from the charDB
 
 CHARMAP
diff --git a/etc/nls/charmaps/MACINTOSH b/etc/nls/charmaps/MACINTOSH
index b826dc9..dd4fa72 100644
--- a/etc/nls/charmaps/MACINTOSH
+++ b/etc/nls/charmaps/MACINTOSH
@@ -1,6 +1,27 @@
 <code_set_name> MACINTOSH
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: The Unicode Standard ver 1.0, ISBN 0-201-56788-1, Oct 1991
 
diff --git a/etc/nls/charmaps/MSZ_7795.3 b/etc/nls/charmaps/MSZ_7795.3
index 7e31823..dfd3b48 100644
--- a/etc/nls/charmaps/MSZ_7795.3
+++ b/etc/nls/charmaps/MSZ_7795.3
@@ -1,6 +1,27 @@
 <code_set_name> MSZ_7795.3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/NATS-DANO b/etc/nls/charmaps/NATS-DANO
index 8b40bec..275f19c 100644
--- a/etc/nls/charmaps/NATS-DANO
+++ b/etc/nls/charmaps/NATS-DANO
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/NATS-DANO-ADD b/etc/nls/charmaps/NATS-DANO-ADD
index 58d7d34..8f88ef4 100644
--- a/etc/nls/charmaps/NATS-DANO-ADD
+++ b/etc/nls/charmaps/NATS-DANO-ADD
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/NATS-SEFI b/etc/nls/charmaps/NATS-SEFI
index 7342613..cd12b16 100644
--- a/etc/nls/charmaps/NATS-SEFI
+++ b/etc/nls/charmaps/NATS-SEFI
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/NATS-SEFI-ADD b/etc/nls/charmaps/NATS-SEFI-ADD
index cd1498b..0a130bf 100644
--- a/etc/nls/charmaps/NATS-SEFI-ADD
+++ b/etc/nls/charmaps/NATS-SEFI-ADD
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/charmaps/NC_NC00-10 b/etc/nls/charmaps/NC_NC00-10
index 9e4c727..b63fa05 100644
--- a/etc/nls/charmaps/NC_NC00-10
+++ b/etc/nls/charmaps/NC_NC00-10
@@ -1,6 +1,27 @@
 <code_set_name> NC_NC00-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/NEXTSTEP b/etc/nls/charmaps/NEXTSTEP
index f40efef..382ba5a 100644
--- a/etc/nls/charmaps/NEXTSTEP
+++ b/etc/nls/charmaps/NEXTSTEP
@@ -1,6 +1,27 @@
 <code_set_name> NEXTSTEP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: Peter Svanberg.
 
diff --git a/etc/nls/charmaps/NF_Z_62-010 b/etc/nls/charmaps/NF_Z_62-010
index 0c6ba93..a78f084 100644
--- a/etc/nls/charmaps/NF_Z_62-010
+++ b/etc/nls/charmaps/NF_Z_62-010
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/NF_Z_62-010_1973 b/etc/nls/charmaps/NF_Z_62-010_1973
index e6c53cc..4debc26 100644
--- a/etc/nls/charmaps/NF_Z_62-010_1973
+++ b/etc/nls/charmaps/NF_Z_62-010_1973
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010_(1973)
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/NS_4551-1 b/etc/nls/charmaps/NS_4551-1
index f99f3fa..9d4a940 100644
--- a/etc/nls/charmaps/NS_4551-1
+++ b/etc/nls/charmaps/NS_4551-1
@@ -1,6 +1,27 @@
 <code_set_name> NS_4551-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/NS_4551-2 b/etc/nls/charmaps/NS_4551-2
index 5a51cf6..05f53da 100644
--- a/etc/nls/charmaps/NS_4551-2
+++ b/etc/nls/charmaps/NS_4551-2
@@ -1,6 +1,27 @@
 <code_set_name> NS_4551-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/PT b/etc/nls/charmaps/PT
index 8a4f85d..883dc11 100644
--- a/etc/nls/charmaps/PT
+++ b/etc/nls/charmaps/PT
@@ -1,6 +1,27 @@
 <code_set_name> PT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/PT2 b/etc/nls/charmaps/PT2
index 9226a0f..d20cf8a 100644
--- a/etc/nls/charmaps/PT2
+++ b/etc/nls/charmaps/PT2
@@ -1,6 +1,27 @@
 <code_set_name> PT2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/SAMI b/etc/nls/charmaps/SAMI
index 8b39a64..b186ce5 100644
--- a/etc/nls/charmaps/SAMI
+++ b/etc/nls/charmaps/SAMI
@@ -1,6 +1,27 @@
 <code_set_name> SAMI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/SAMI-WS2 b/etc/nls/charmaps/SAMI-WS2
index 55b8ea6..cea705b 100644
--- a/etc/nls/charmaps/SAMI-WS2
+++ b/etc/nls/charmaps/SAMI-WS2
@@ -1,6 +1,28 @@
 <code_set_name> WIN-SAMI-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
 % source: <URL:http://www2.isl.uit.no/trond/ws2t.html> and
 %         <URL:http://www.unicode.org/unicode/alloc/Pipeline.html>
 % author: Petter Reinholdtsen <pere@td.org.uit.no>
diff --git a/etc/nls/charmaps/SEN_850200_B b/etc/nls/charmaps/SEN_850200_B
index f23dcfe..9f841a5 100644
--- a/etc/nls/charmaps/SEN_850200_B
+++ b/etc/nls/charmaps/SEN_850200_B
@@ -1,6 +1,27 @@
 <code_set_name> SEN_850200_B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/SEN_850200_C b/etc/nls/charmaps/SEN_850200_C
index 57a76b6..c8c5708 100644
--- a/etc/nls/charmaps/SEN_850200_C
+++ b/etc/nls/charmaps/SEN_850200_C
@@ -1,6 +1,27 @@
 <code_set_name> SEN_850200_C
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/Shift_JIS b/etc/nls/charmaps/Shift_JIS
index da0192f..f812b8f 100644
--- a/etc/nls/charmaps/Shift_JIS
+++ b/etc/nls/charmaps/Shift_JIS
@@ -3,6 +3,27 @@
 <escape_char> /
 <mb_cur_min> 1
 <mb_cur_max> 2
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % alias SJIS
 CHARMAP
diff --git a/etc/nls/charmaps/T.101-G2 b/etc/nls/charmaps/T.101-G2
index 5d632b5..665f9e6 100644
--- a/etc/nls/charmaps/T.101-G2
+++ b/etc/nls/charmaps/T.101-G2
@@ -1,6 +1,27 @@
 <code_set_name> T.101-G2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/T.61-7BIT b/etc/nls/charmaps/T.61-7BIT
index e694130..4949fa2 100644
--- a/etc/nls/charmaps/T.61-7BIT
+++ b/etc/nls/charmaps/T.61-7BIT
@@ -1,6 +1,27 @@
 <code_set_name> T.61-7BIT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/TCVN5712-1 b/etc/nls/charmaps/TCVN5712-1
index 0df7cc4..ed17e1d 100644
--- a/etc/nls/charmaps/TCVN5712-1
+++ b/etc/nls/charmaps/TCVN5712-1
@@ -3,6 +3,27 @@
 <escape_char>   /
 <mb_cur_min>    1
 <mb_cur_max>    2
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % alias TCVN
 % alias TCVN-5712
diff --git a/etc/nls/charmaps/TIS-620 b/etc/nls/charmaps/TIS-620
index 5d34e80..cf84ac0 100644
--- a/etc/nls/charmaps/TIS-620
+++ b/etc/nls/charmaps/TIS-620
@@ -1,6 +1,27 @@
 <code_set_name> TIS-620
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  sources: Thai Industrial Standards Institute, ECMA registry, IANA
 % alias TIS620
diff --git a/etc/nls/charmaps/UTF-8 b/etc/nls/charmaps/UTF-8
index 346bf31..5ce4d33 100644
--- a/etc/nls/charmaps/UTF-8
+++ b/etc/nls/charmaps/UTF-8
@@ -3,7 +3,27 @@
 <escape_char> /
 <mb_cur_min> 1
 <mb_cur_max> 6
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % alias ISO-10646/UTF-8
 CHARMAP
 <U0000>     /x00         NULL
diff --git a/etc/nls/charmaps/VIDEOTEX-SUPPL b/etc/nls/charmaps/VIDEOTEX-SUPPL
index ab84c81..8044577 100644
--- a/etc/nls/charmaps/VIDEOTEX-SUPPL
+++ b/etc/nls/charmaps/VIDEOTEX-SUPPL
@@ -1,6 +1,27 @@
 <code_set_name> VIDEOTEX-SUPPL
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 %  source: ECMA registry
 
diff --git a/etc/nls/charmaps/VISCII b/etc/nls/charmaps/VISCII
index 736a4ae..173e5ac 100644
--- a/etc/nls/charmaps/VISCII
+++ b/etc/nls/charmaps/VISCII
@@ -1,6 +1,27 @@
 <code_set_name> VISCII
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 CHARMAP
 <U0000>     /x00         NULL (NUL)
diff --git a/etc/nls/posix/charmaps/100 b/etc/nls/posix/charmaps/100
index 40733dd..ef03b2c 100644
--- a/etc/nls/posix/charmaps/100
+++ b/etc/nls/posix/charmaps/100
@@ -1,6 +1,27 @@
 <code_set_name> IBM905
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/101 b/etc/nls/posix/charmaps/101
index 0bb82ba..fff46af 100644
--- a/etc/nls/posix/charmaps/101
+++ b/etc/nls/posix/charmaps/101
@@ -1,6 +1,27 @@
 <code_set_name> IBM918
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/102 b/etc/nls/posix/charmaps/102
index 2eb5330..d76d78a 100644
--- a/etc/nls/posix/charmaps/102
+++ b/etc/nls/posix/charmaps/102
@@ -1,6 +1,27 @@
 <code_set_name> IEC_P27-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/1026 b/etc/nls/posix/charmaps/1026
index 4530e19..3527c4c 100644
--- a/etc/nls/posix/charmaps/1026
+++ b/etc/nls/posix/charmaps/1026
@@ -1,6 +1,27 @@
 <code_set_name> IBM1026
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/103 b/etc/nls/posix/charmaps/103
index 8bc7e9e..c4f3fd9 100644
--- a/etc/nls/posix/charmaps/103
+++ b/etc/nls/posix/charmaps/103
@@ -1,6 +1,27 @@
 <code_set_name> INIS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/104 b/etc/nls/posix/charmaps/104
index 9916a43..81ea4ec 100644
--- a/etc/nls/posix/charmaps/104
+++ b/etc/nls/posix/charmaps/104
@@ -1,6 +1,27 @@
 <code_set_name> INIS-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/1047 b/etc/nls/posix/charmaps/1047
index ce51e14..11cd277 100644
--- a/etc/nls/posix/charmaps/1047
+++ b/etc/nls/posix/charmaps/1047
@@ -1,6 +1,27 @@
 <code_set_name> IBM1047
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Character Data Representation Architecture
diff --git a/etc/nls/posix/charmaps/105 b/etc/nls/posix/charmaps/105
index cd1e8bf..64714e1 100644
--- a/etc/nls/posix/charmaps/105
+++ b/etc/nls/posix/charmaps/105
@@ -1,6 +1,27 @@
 <code_set_name> INIS-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/106 b/etc/nls/posix/charmaps/106
index 20210ca..b86ab24 100644
--- a/etc/nls/posix/charmaps/106
+++ b/etc/nls/posix/charmaps/106
@@ -1,6 +1,27 @@
 <code_set_name> INVARIANT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias ISO-IR-170
diff --git a/etc/nls/posix/charmaps/107 b/etc/nls/posix/charmaps/107
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/107
+++ b/etc/nls/posix/charmaps/107
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/108 b/etc/nls/posix/charmaps/108
index 9fafa07..40fd161 100644
--- a/etc/nls/posix/charmaps/108
+++ b/etc/nls/posix/charmaps/108
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/109 b/etc/nls/posix/charmaps/109
index fbd66da..31ec21c 100644
--- a/etc/nls/posix/charmaps/109
+++ b/etc/nls/posix/charmaps/109
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/11 b/etc/nls/posix/charmaps/11
index 1b7058e..2462e23 100644
--- a/etc/nls/posix/charmaps/11
+++ b/etc/nls/posix/charmaps/11
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.110-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/110 b/etc/nls/posix/charmaps/110
index ef86d7a..7de488c 100644
--- a/etc/nls/posix/charmaps/110
+++ b/etc/nls/posix/charmaps/110
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/111 b/etc/nls/posix/charmaps/111
index e8f3c52..70b7bb3 100644
--- a/etc/nls/posix/charmaps/111
+++ b/etc/nls/posix/charmaps/111
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/112 b/etc/nls/posix/charmaps/112
index b20160f..9bc968f 100644
--- a/etc/nls/posix/charmaps/112
+++ b/etc/nls/posix/charmaps/112
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-5
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/113 b/etc/nls/posix/charmaps/113
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/113
+++ b/etc/nls/posix/charmaps/113
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/114 b/etc/nls/posix/charmaps/114
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/114
+++ b/etc/nls/posix/charmaps/114
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/115 b/etc/nls/posix/charmaps/115
index a759279..7a18076 100644
--- a/etc/nls/posix/charmaps/115
+++ b/etc/nls/posix/charmaps/115
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/116 b/etc/nls/posix/charmaps/116
index e63d758..6b222b6 100644
--- a/etc/nls/posix/charmaps/116
+++ b/etc/nls/posix/charmaps/116
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/117 b/etc/nls/posix/charmaps/117
index b8742d3..ace6895 100644
--- a/etc/nls/posix/charmaps/117
+++ b/etc/nls/posix/charmaps/117
@@ -1,6 +1,27 @@
 <code_set_name> ISO-IR-90
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/118 b/etc/nls/posix/charmaps/118
index ee7fee9..934cbd5 100644
--- a/etc/nls/posix/charmaps/118
+++ b/etc/nls/posix/charmaps/118
@@ -1,6 +1,27 @@
 <code_set_name> ISO_10367-BOX
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/119 b/etc/nls/posix/charmaps/119
index 1792311..29319ff 100644
--- a/etc/nls/posix/charmaps/119
+++ b/etc/nls/posix/charmaps/119
@@ -1,6 +1,27 @@
 <code_set_name> ISO_2033-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/12 b/etc/nls/posix/charmaps/12
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/12
+++ b/etc/nls/posix/charmaps/12
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/120 b/etc/nls/posix/charmaps/120
index 1ef9715..073af03 100644
--- a/etc/nls/posix/charmaps/120
+++ b/etc/nls/posix/charmaps/120
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/121 b/etc/nls/posix/charmaps/121
index 3d68966..5e227cc 100644
--- a/etc/nls/posix/charmaps/121
+++ b/etc/nls/posix/charmaps/121
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427-EXT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/122 b/etc/nls/posix/charmaps/122
index 386184d..acff898 100644
--- a/etc/nls/posix/charmaps/122
+++ b/etc/nls/posix/charmaps/122
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5428
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/123 b/etc/nls/posix/charmaps/123
index cc38848..fb0ae5e 100644
--- a/etc/nls/posix/charmaps/123
+++ b/etc/nls/posix/charmaps/123
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.BASIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/124 b/etc/nls/posix/charmaps/124
index 552ceb3..799bc27 100644
--- a/etc/nls/posix/charmaps/124
+++ b/etc/nls/posix/charmaps/124
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.IRV
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/125 b/etc/nls/posix/charmaps/125
index e39b7a2..2004501 100644
--- a/etc/nls/posix/charmaps/125
+++ b/etc/nls/posix/charmaps/125
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO/IEC 6937:1992
diff --git a/etc/nls/posix/charmaps/126 b/etc/nls/posix/charmaps/126
index bdddcb9..15b02e8 100644
--- a/etc/nls/posix/charmaps/126
+++ b/etc/nls/posix/charmaps/126
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-25
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/127 b/etc/nls/posix/charmaps/127
index b006c3e..a9957a9 100644
--- a/etc/nls/posix/charmaps/127
+++ b/etc/nls/posix/charmaps/127
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO 6937-2:1983
diff --git a/etc/nls/posix/charmaps/128 b/etc/nls/posix/charmaps/128
index 77afb7b..a0750d5 100644
--- a/etc/nls/posix/charmaps/128
+++ b/etc/nls/posix/charmaps/128
@@ -1,6 +1,27 @@
 <code_set_name> ISO_8859-SUPP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/129 b/etc/nls/posix/charmaps/129
index 196f806..8447955 100644
--- a/etc/nls/posix/charmaps/129
+++ b/etc/nls/posix/charmaps/129
@@ -1,6 +1,27 @@
 <code_set_name> IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/13 b/etc/nls/posix/charmaps/13
index 6ab93e7..90411fb 100644
--- a/etc/nls/posix/charmaps/13
+++ b/etc/nls/posix/charmaps/13
@@ -1,6 +1,27 @@
 <code_set_name> ASMO_449
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/130 b/etc/nls/posix/charmaps/130
index 2044d0c..432772b 100644
--- a/etc/nls/posix/charmaps/130
+++ b/etc/nls/posix/charmaps/130
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-JP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/131 b/etc/nls/posix/charmaps/131
index 279e8d6..e8db92c 100644
--- a/etc/nls/posix/charmaps/131
+++ b/etc/nls/posix/charmaps/131
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-RO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/132 b/etc/nls/posix/charmaps/132
index 7d77a6c..b8f26b7 100644
--- a/etc/nls/posix/charmaps/132
+++ b/etc/nls/posix/charmaps/132
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/133 b/etc/nls/posix/charmaps/133
index faa9b9b..14a2aa9 100644
--- a/etc/nls/posix/charmaps/133
+++ b/etc/nls/posix/charmaps/133
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/134 b/etc/nls/posix/charmaps/134
index 8c7c383..47b368c 100644
--- a/etc/nls/posix/charmaps/134
+++ b/etc/nls/posix/charmaps/134
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/135 b/etc/nls/posix/charmaps/135
index 5b4be9e..3d76dcd 100644
--- a/etc/nls/posix/charmaps/135
+++ b/etc/nls/posix/charmaps/135
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/136 b/etc/nls/posix/charmaps/136
index 0e494a7..5a91e7d 100644
--- a/etc/nls/posix/charmaps/136
+++ b/etc/nls/posix/charmaps/136
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/137 b/etc/nls/posix/charmaps/137
index 80a3a92..3f8ebe5 100644
--- a/etc/nls/posix/charmaps/137
+++ b/etc/nls/posix/charmaps/137
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-KANA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/138 b/etc/nls/posix/charmaps/138
index f6e9a71..5565045 100644
--- a/etc/nls/posix/charmaps/138
+++ b/etc/nls/posix/charmaps/138
@@ -1,6 +1,27 @@
 <code_set_name> JIS_X0201
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias X0201
diff --git a/etc/nls/posix/charmaps/139 b/etc/nls/posix/charmaps/139
index 7eb6db6..ba12d21 100644
--- a/etc/nls/posix/charmaps/139
+++ b/etc/nls/posix/charmaps/139
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.002
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/14 b/etc/nls/posix/charmaps/14
index fe38aa9..a875409 100644
--- a/etc/nls/posix/charmaps/14
+++ b/etc/nls/posix/charmaps/14
@@ -1,6 +1,27 @@
 <code_set_name> BALTIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/140 b/etc/nls/posix/charmaps/140
index 3ab5957..3187f43 100644
--- a/etc/nls/posix/charmaps/140
+++ b/etc/nls/posix/charmaps/140
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-MAC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/141 b/etc/nls/posix/charmaps/141
index 0ef72f3..ef5723d 100644
--- a/etc/nls/posix/charmaps/141
+++ b/etc/nls/posix/charmaps/141
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-SERB
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/142 b/etc/nls/posix/charmaps/142
index 497e1ab..955b42c 100644
--- a/etc/nls/posix/charmaps/142
+++ b/etc/nls/posix/charmaps/142
@@ -1,6 +1,27 @@
 <code_set_name> KOI-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Andrey A. Chernov <ache@astral.msk.su>
diff --git a/etc/nls/posix/charmaps/143 b/etc/nls/posix/charmaps/143
index 2ff2d43..8c740da 100644
--- a/etc/nls/posix/charmaps/143
+++ b/etc/nls/posix/charmaps/143
@@ -1,6 +1,27 @@
 <code_set_name> KOI8-R
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: RFC1489 via Gabor Kiss <kissg@sztaki.hu>
diff --git a/etc/nls/posix/charmaps/144 b/etc/nls/posix/charmaps/144
index bec7a2e..6e44b75 100644
--- a/etc/nls/posix/charmaps/144
+++ b/etc/nls/posix/charmaps/144
@@ -1,6 +1,27 @@
 <code_set_name> KSC5636
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias ISO646-KR
diff --git a/etc/nls/posix/charmaps/145 b/etc/nls/posix/charmaps/145
index 0caa28a..895c2fa 100644
--- a/etc/nls/posix/charmaps/145
+++ b/etc/nls/posix/charmaps/145
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/146 b/etc/nls/posix/charmaps/146
index b782acb..3835100 100644
--- a/etc/nls/posix/charmaps/146
+++ b/etc/nls/posix/charmaps/146
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/147 b/etc/nls/posix/charmaps/147
index 79ef293..8ec293b 100644
--- a/etc/nls/posix/charmaps/147
+++ b/etc/nls/posix/charmaps/147
@@ -1,6 +1,27 @@
 <code_set_name> MAC-IS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 CHARMAP
diff --git a/etc/nls/posix/charmaps/148 b/etc/nls/posix/charmaps/148
index f004165..e93e640 100644
--- a/etc/nls/posix/charmaps/148
+++ b/etc/nls/posix/charmaps/148
@@ -1,6 +1,27 @@
 <code_set_name> MACINTOSH
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: The Unicode Standard ver 1.0, ISBN 0-201-56788-1, Oct 1991
diff --git a/etc/nls/posix/charmaps/149 b/etc/nls/posix/charmaps/149
index 229857b..e4d9668 100644
--- a/etc/nls/posix/charmaps/149
+++ b/etc/nls/posix/charmaps/149
@@ -1,6 +1,27 @@
 <code_set_name> MSZ_7795.3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/15 b/etc/nls/posix/charmaps/15
index 14c6f2d..f26e700 100644
--- a/etc/nls/posix/charmaps/15
+++ b/etc/nls/posix/charmaps/15
@@ -1,6 +1,27 @@
 <code_set_name> BS_4730
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/150 b/etc/nls/posix/charmaps/150
index dcf6474..10dcd15 100644
--- a/etc/nls/posix/charmaps/150
+++ b/etc/nls/posix/charmaps/150
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/151 b/etc/nls/posix/charmaps/151
index 58d7d34..8f88ef4 100644
--- a/etc/nls/posix/charmaps/151
+++ b/etc/nls/posix/charmaps/151
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/152 b/etc/nls/posix/charmaps/152
index 86d0a1f..ab89a36 100644
--- a/etc/nls/posix/charmaps/152
+++ b/etc/nls/posix/charmaps/152
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/153 b/etc/nls/posix/charmaps/153
index cd1498b..0a130bf 100644
--- a/etc/nls/posix/charmaps/153
+++ b/etc/nls/posix/charmaps/153
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/154 b/etc/nls/posix/charmaps/154
index a67c0bd..5b21002 100644
--- a/etc/nls/posix/charmaps/154
+++ b/etc/nls/posix/charmaps/154
@@ -1,6 +1,27 @@
 <code_set_name> NC_NC00-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/155 b/etc/nls/posix/charmaps/155
index 3202e53..66b02ef 100644
--- a/etc/nls/posix/charmaps/155
+++ b/etc/nls/posix/charmaps/155
@@ -1,6 +1,27 @@
 <code_set_name> NEXTSTEP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Peter Svanberg.
diff --git a/etc/nls/posix/charmaps/156 b/etc/nls/posix/charmaps/156
index f75c875..19cdb94 100644
--- a/etc/nls/posix/charmaps/156
+++ b/etc/nls/posix/charmaps/156
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/16 b/etc/nls/posix/charmaps/16
index 7321d2d..74cdd6c 100644
--- a/etc/nls/posix/charmaps/16
+++ b/etc/nls/posix/charmaps/16
@@ -1,6 +1,27 @@
 <code_set_name> BS_VIEWDATA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/17 b/etc/nls/posix/charmaps/17
index 3c8a7ef..509f57e 100644
--- a/etc/nls/posix/charmaps/17
+++ b/etc/nls/posix/charmaps/17
@@ -1,6 +1,27 @@
 <code_set_name> CP1250
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/18 b/etc/nls/posix/charmaps/18
index 73f5889..f651c50 100644
--- a/etc/nls/posix/charmaps/18
+++ b/etc/nls/posix/charmaps/18
@@ -1,6 +1,27 @@
 <code_set_name> CP1251
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/19 b/etc/nls/posix/charmaps/19
index 44824f4..d4948e8 100644
--- a/etc/nls/posix/charmaps/19
+++ b/etc/nls/posix/charmaps/19
@@ -1,6 +1,27 @@
 <code_set_name> CP1252
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/20 b/etc/nls/posix/charmaps/20
index d8ac293..9a49e5c 100644
--- a/etc/nls/posix/charmaps/20
+++ b/etc/nls/posix/charmaps/20
@@ -1,6 +1,27 @@
 <code_set_name> CP1253
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/21 b/etc/nls/posix/charmaps/21
index e614632..8861fcb 100644
--- a/etc/nls/posix/charmaps/21
+++ b/etc/nls/posix/charmaps/21
@@ -1,6 +1,27 @@
 <code_set_name> CP1254
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/22 b/etc/nls/posix/charmaps/22
index dc4e62b..3cfbaed 100644
--- a/etc/nls/posix/charmaps/22
+++ b/etc/nls/posix/charmaps/22
@@ -1,6 +1,27 @@
 <code_set_name> CP1255
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/23 b/etc/nls/posix/charmaps/23
index 5ac8f08..2450440 100644
--- a/etc/nls/posix/charmaps/23
+++ b/etc/nls/posix/charmaps/23
@@ -1,6 +1,27 @@
 <code_set_name> CP1256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/24 b/etc/nls/posix/charmaps/24
index 9d00e9c..e00dcf3 100644
--- a/etc/nls/posix/charmaps/24
+++ b/etc/nls/posix/charmaps/24
@@ -1,6 +1,27 @@
 <code_set_name> CP1257
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: CEN/TC304 N283 
diff --git a/etc/nls/posix/charmaps/25 b/etc/nls/posix/charmaps/25
index e1ed5a0..5712b28 100644
--- a/etc/nls/posix/charmaps/25
+++ b/etc/nls/posix/charmaps/25
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/26 b/etc/nls/posix/charmaps/26
index 434671e..0669379 100644
--- a/etc/nls/posix/charmaps/26
+++ b/etc/nls/posix/charmaps/26
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/27 b/etc/nls/posix/charmaps/27
index 11f8429..2219f39 100644
--- a/etc/nls/posix/charmaps/27
+++ b/etc/nls/posix/charmaps/27
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-GR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/28 b/etc/nls/posix/charmaps/28
index afaa080..abc0adc 100644
--- a/etc/nls/posix/charmaps/28
+++ b/etc/nls/posix/charmaps/28
@@ -1,6 +1,27 @@
 <code_set_name> CSN_369103
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/29 b/etc/nls/posix/charmaps/29
index f955191..9a6d0a1 100644
--- a/etc/nls/posix/charmaps/29
+++ b/etc/nls/posix/charmaps/29
@@ -1,6 +1,27 @@
 <code_set_name> CWI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Computerworld Sza'mita'stechnika vol 3 issue 13 1988-06-29
diff --git a/etc/nls/posix/charmaps/30 b/etc/nls/posix/charmaps/30
index cef3ae4..edd745e 100644
--- a/etc/nls/posix/charmaps/30
+++ b/etc/nls/posix/charmaps/30
@@ -1,6 +1,27 @@
 <code_set_name> DEC-MCS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  VAX/VMS User's Manual, Order Number: AI-Y517A-TE, April 1986.
diff --git a/etc/nls/posix/charmaps/31 b/etc/nls/posix/charmaps/31
index b0d2c26..6a973bd 100644
--- a/etc/nls/posix/charmaps/31
+++ b/etc/nls/posix/charmaps/31
@@ -1,6 +1,27 @@
 <code_set_name> DIN_66003
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/32 b/etc/nls/posix/charmaps/32
index 9bf632b..39b5b16 100644
--- a/etc/nls/posix/charmaps/32
+++ b/etc/nls/posix/charmaps/32
@@ -1,6 +1,27 @@
 <code_set_name> DS_2089
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Danish Standard, DS 2089, February 1974
diff --git a/etc/nls/posix/charmaps/33 b/etc/nls/posix/charmaps/33
index 2beafc0..6ab52cf 100644
--- a/etc/nls/posix/charmaps/33
+++ b/etc/nls/posix/charmaps/33
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-AT-DE
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/34 b/etc/nls/posix/charmaps/34
index 0a344e6..26b7260 100644
--- a/etc/nls/posix/charmaps/34
+++ b/etc/nls/posix/charmaps/34
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-AT-DE-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/35 b/etc/nls/posix/charmaps/35
index c022339..794a087 100644
--- a/etc/nls/posix/charmaps/35
+++ b/etc/nls/posix/charmaps/35
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-CA-FR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/36 b/etc/nls/posix/charmaps/36
index bd6d44d..5bda476 100644
--- a/etc/nls/posix/charmaps/36
+++ b/etc/nls/posix/charmaps/36
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-DK-NO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/37 b/etc/nls/posix/charmaps/37
index 9360c6c..37ea9d8 100644
--- a/etc/nls/posix/charmaps/37
+++ b/etc/nls/posix/charmaps/37
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-DK-NO-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/38 b/etc/nls/posix/charmaps/38
index cb329d3..028d39e 100644
--- a/etc/nls/posix/charmaps/38
+++ b/etc/nls/posix/charmaps/38
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/39 b/etc/nls/posix/charmaps/39
index 7a3523a..899b55c 100644
--- a/etc/nls/posix/charmaps/39
+++ b/etc/nls/posix/charmaps/39
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/40 b/etc/nls/posix/charmaps/40
index d861b1f..5f7b2eb 100644
--- a/etc/nls/posix/charmaps/40
+++ b/etc/nls/posix/charmaps/40
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES-S
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/41 b/etc/nls/posix/charmaps/41
index b644379..e86b701 100644
--- a/etc/nls/posix/charmaps/41
+++ b/etc/nls/posix/charmaps/41
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FI-SE
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/42 b/etc/nls/posix/charmaps/42
index c9920b4..6799d23 100644
--- a/etc/nls/posix/charmaps/42
+++ b/etc/nls/posix/charmaps/42
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FI-SE-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/43 b/etc/nls/posix/charmaps/43
index 86f0052..5746e08 100644
--- a/etc/nls/posix/charmaps/43
+++ b/etc/nls/posix/charmaps/43
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/437 b/etc/nls/posix/charmaps/437
index 3291d3e..61d2535 100644
--- a/etc/nls/posix/charmaps/437
+++ b/etc/nls/posix/charmaps/437
@@ -1,6 +1,27 @@
 <code_set_name> IBM437
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/44 b/etc/nls/posix/charmaps/44
index 3ab1f3e..c737c5c 100644
--- a/etc/nls/posix/charmaps/44
+++ b/etc/nls/posix/charmaps/44
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-IS-FRISS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Skyrsuvelar Rikisins og Reykjavikurborgar, feb 1982
diff --git a/etc/nls/posix/charmaps/45 b/etc/nls/posix/charmaps/45
index 2dac17e..52bc84c 100644
--- a/etc/nls/posix/charmaps/45
+++ b/etc/nls/posix/charmaps/45
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/46 b/etc/nls/posix/charmaps/46
index 2bddf14..6ef732d 100644
--- a/etc/nls/posix/charmaps/46
+++ b/etc/nls/posix/charmaps/46
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-PT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/47 b/etc/nls/posix/charmaps/47
index 7e2112c..d374dca 100644
--- a/etc/nls/posix/charmaps/47
+++ b/etc/nls/posix/charmaps/47
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-UK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/48 b/etc/nls/posix/charmaps/48
index 41722a4..0b6617b 100644
--- a/etc/nls/posix/charmaps/48
+++ b/etc/nls/posix/charmaps/48
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-US
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/49 b/etc/nls/posix/charmaps/49
index 78011d2..f503f68 100644
--- a/etc/nls/posix/charmaps/49
+++ b/etc/nls/posix/charmaps/49
@@ -1,6 +1,27 @@
 <code_set_name> ECMA-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/50 b/etc/nls/posix/charmaps/50
index ad2ecde..0ac83be 100644
--- a/etc/nls/posix/charmaps/50
+++ b/etc/nls/posix/charmaps/50
@@ -1,6 +1,27 @@
 <code_set_name> ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/500 b/etc/nls/posix/charmaps/500
index 3ba99b0..c07b78f 100644
--- a/etc/nls/posix/charmaps/500
+++ b/etc/nls/posix/charmaps/500
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/500V1 b/etc/nls/posix/charmaps/500V1
index 3ba99b0..c07b78f 100644
--- a/etc/nls/posix/charmaps/500V1
+++ b/etc/nls/posix/charmaps/500V1
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/51 b/etc/nls/posix/charmaps/51
index 17caa7e..1220f35 100644
--- a/etc/nls/posix/charmaps/51
+++ b/etc/nls/posix/charmaps/51
@@ -1,6 +1,27 @@
 <code_set_name> ES2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/52 b/etc/nls/posix/charmaps/52
index 8516cf3..d7f7822 100644
--- a/etc/nls/posix/charmaps/52
+++ b/etc/nls/posix/charmaps/52
@@ -1,6 +1,27 @@
 <code_set_name> GB_1988-80
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/53 b/etc/nls/posix/charmaps/53
index 591da72..94cb743 100644
--- a/etc/nls/posix/charmaps/53
+++ b/etc/nls/posix/charmaps/53
@@ -1,6 +1,27 @@
 <code_set_name> GOST_19768-74
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/54 b/etc/nls/posix/charmaps/54
index 153589e..0250e61 100644
--- a/etc/nls/posix/charmaps/54
+++ b/etc/nls/posix/charmaps/54
@@ -1,6 +1,27 @@
 <code_set_name> GREEK-CCITT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/55 b/etc/nls/posix/charmaps/55
index 8de7b61..0ce59b3 100644
--- a/etc/nls/posix/charmaps/55
+++ b/etc/nls/posix/charmaps/55
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/56 b/etc/nls/posix/charmaps/56
index 125c42e..df1cfd5 100644
--- a/etc/nls/posix/charmaps/56
+++ b/etc/nls/posix/charmaps/56
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7-OLD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/57 b/etc/nls/posix/charmaps/57
index 1e84b7b..68136bc 100644
--- a/etc/nls/posix/charmaps/57
+++ b/etc/nls/posix/charmaps/57
@@ -1,6 +1,27 @@
 <code_set_name> HP-ROMAN8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: LaserJet IIP Printer User's Manual,
diff --git a/etc/nls/posix/charmaps/58 b/etc/nls/posix/charmaps/58
index 7fadb5e..7b6081c 100644
--- a/etc/nls/posix/charmaps/58
+++ b/etc/nls/posix/charmaps/58
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/59 b/etc/nls/posix/charmaps/59
index 2511c8b..8f4c6fe 100644
--- a/etc/nls/posix/charmaps/59
+++ b/etc/nls/posix/charmaps/59
@@ -1,6 +1,27 @@
 <code_set_name> IBM038
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/60 b/etc/nls/posix/charmaps/60
index e9d7f63..8ab55ba 100644
--- a/etc/nls/posix/charmaps/60
+++ b/etc/nls/posix/charmaps/60
@@ -1,6 +1,27 @@
 <code_set_name> IBM1004
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: CEN/TC304 N283, 1994-02-04
diff --git a/etc/nls/posix/charmaps/61 b/etc/nls/posix/charmaps/61
index 4530e19..3527c4c 100644
--- a/etc/nls/posix/charmaps/61
+++ b/etc/nls/posix/charmaps/61
@@ -1,6 +1,27 @@
 <code_set_name> IBM1026
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/62 b/etc/nls/posix/charmaps/62
index ce51e14..11cd277 100644
--- a/etc/nls/posix/charmaps/62
+++ b/etc/nls/posix/charmaps/62
@@ -1,6 +1,27 @@
 <code_set_name> IBM1047
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Character Data Representation Architecture
diff --git a/etc/nls/posix/charmaps/63 b/etc/nls/posix/charmaps/63
index b5ec14e..c3b076b 100644
--- a/etc/nls/posix/charmaps/63
+++ b/etc/nls/posix/charmaps/63
@@ -1,6 +1,27 @@
 <code_set_name> IBM256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Registry C-H 3-3220-050
diff --git a/etc/nls/posix/charmaps/64 b/etc/nls/posix/charmaps/64
index 3659455..1fdcfcf 100644
--- a/etc/nls/posix/charmaps/64
+++ b/etc/nls/posix/charmaps/64
@@ -1,6 +1,27 @@
 <code_set_name> IBM273
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/65 b/etc/nls/posix/charmaps/65
index 7fc3ac2..08616e1 100644
--- a/etc/nls/posix/charmaps/65
+++ b/etc/nls/posix/charmaps/65
@@ -1,6 +1,27 @@
 <code_set_name> IBM274
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/66 b/etc/nls/posix/charmaps/66
index 71e950d..4b08cc1 100644
--- a/etc/nls/posix/charmaps/66
+++ b/etc/nls/posix/charmaps/66
@@ -1,6 +1,27 @@
 <code_set_name> IBM275
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/67 b/etc/nls/posix/charmaps/67
index 51a2472..2bf08dc 100644
--- a/etc/nls/posix/charmaps/67
+++ b/etc/nls/posix/charmaps/67
@@ -1,6 +1,27 @@
 <code_set_name> IBM277
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/68 b/etc/nls/posix/charmaps/68
index d5f2c2c..3a4a408 100644
--- a/etc/nls/posix/charmaps/68
+++ b/etc/nls/posix/charmaps/68
@@ -1,6 +1,27 @@
 <code_set_name> IBM278
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/69 b/etc/nls/posix/charmaps/69
index 1003b27..1c4b691 100644
--- a/etc/nls/posix/charmaps/69
+++ b/etc/nls/posix/charmaps/69
@@ -1,6 +1,27 @@
 <code_set_name> IBM280
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/70 b/etc/nls/posix/charmaps/70
index 40a0770..1900c34 100644
--- a/etc/nls/posix/charmaps/70
+++ b/etc/nls/posix/charmaps/70
@@ -1,6 +1,27 @@
 <code_set_name> IBM281
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/71 b/etc/nls/posix/charmaps/71
index 0d388d1..bbd4048 100644
--- a/etc/nls/posix/charmaps/71
+++ b/etc/nls/posix/charmaps/71
@@ -1,6 +1,27 @@
 <code_set_name> IBM284
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/72 b/etc/nls/posix/charmaps/72
index d72c4ae..eac085f 100644
--- a/etc/nls/posix/charmaps/72
+++ b/etc/nls/posix/charmaps/72
@@ -1,6 +1,27 @@
 <code_set_name> IBM285
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/73 b/etc/nls/posix/charmaps/73
index f63ba2f..8722ada 100644
--- a/etc/nls/posix/charmaps/73
+++ b/etc/nls/posix/charmaps/73
@@ -1,6 +1,27 @@
 <code_set_name> IBM290
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/74 b/etc/nls/posix/charmaps/74
index 25564a8..31aa5e1 100644
--- a/etc/nls/posix/charmaps/74
+++ b/etc/nls/posix/charmaps/74
@@ -1,6 +1,27 @@
 <code_set_name> IBM297
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/75 b/etc/nls/posix/charmaps/75
index 4bf56c6..8296c7e 100644
--- a/etc/nls/posix/charmaps/75
+++ b/etc/nls/posix/charmaps/75
@@ -1,6 +1,27 @@
 <code_set_name> IBM420
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/76 b/etc/nls/posix/charmaps/76
index b7ea5ed..cacf1b9 100644
--- a/etc/nls/posix/charmaps/76
+++ b/etc/nls/posix/charmaps/76
@@ -1,6 +1,27 @@
 <code_set_name> IBM423
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/77 b/etc/nls/posix/charmaps/77
index 2baee64..e498d73 100644
--- a/etc/nls/posix/charmaps/77
+++ b/etc/nls/posix/charmaps/77
@@ -1,6 +1,27 @@
 <code_set_name> IBM424
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/78 b/etc/nls/posix/charmaps/78
index 3291d3e..61d2535 100644
--- a/etc/nls/posix/charmaps/78
+++ b/etc/nls/posix/charmaps/78
@@ -1,6 +1,27 @@
 <code_set_name> IBM437
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/79 b/etc/nls/posix/charmaps/79
index 3ba99b0..c07b78f 100644
--- a/etc/nls/posix/charmaps/79
+++ b/etc/nls/posix/charmaps/79
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/80 b/etc/nls/posix/charmaps/80
index 3965589..e6a7336 100644
--- a/etc/nls/posix/charmaps/80
+++ b/etc/nls/posix/charmaps/80
@@ -1,6 +1,27 @@
 <code_set_name> IBM850
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/81 b/etc/nls/posix/charmaps/81
index 9c6509f..2548bd8 100644
--- a/etc/nls/posix/charmaps/81
+++ b/etc/nls/posix/charmaps/81
@@ -1,6 +1,27 @@
 <code_set_name> IBM851
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/82 b/etc/nls/posix/charmaps/82
index c7807d2..f4b6dbc 100644
--- a/etc/nls/posix/charmaps/82
+++ b/etc/nls/posix/charmaps/82
@@ -1,6 +1,27 @@
 <code_set_name> IBM852
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/83 b/etc/nls/posix/charmaps/83
index f1af94d..48f1ded 100644
--- a/etc/nls/posix/charmaps/83
+++ b/etc/nls/posix/charmaps/83
@@ -1,6 +1,27 @@
 <code_set_name> IBM855
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/84 b/etc/nls/posix/charmaps/84
index 3c3ecfe..a822bdb 100644
--- a/etc/nls/posix/charmaps/84
+++ b/etc/nls/posix/charmaps/84
@@ -1,6 +1,27 @@
 <code_set_name> IBM857
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/85 b/etc/nls/posix/charmaps/85
index c655560..9f0f357 100644
--- a/etc/nls/posix/charmaps/85
+++ b/etc/nls/posix/charmaps/85
@@ -1,6 +1,27 @@
 <code_set_name> IBM860
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/850 b/etc/nls/posix/charmaps/850
index 3965589..e6a7336 100644
--- a/etc/nls/posix/charmaps/850
+++ b/etc/nls/posix/charmaps/850
@@ -1,6 +1,27 @@
 <code_set_name> IBM850
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/851 b/etc/nls/posix/charmaps/851
index 9c6509f..2548bd8 100644
--- a/etc/nls/posix/charmaps/851
+++ b/etc/nls/posix/charmaps/851
@@ -1,6 +1,27 @@
 <code_set_name> IBM851
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/852 b/etc/nls/posix/charmaps/852
index c7807d2..f4b6dbc 100644
--- a/etc/nls/posix/charmaps/852
+++ b/etc/nls/posix/charmaps/852
@@ -1,6 +1,27 @@
 <code_set_name> IBM852
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/855 b/etc/nls/posix/charmaps/855
index f1af94d..48f1ded 100644
--- a/etc/nls/posix/charmaps/855
+++ b/etc/nls/posix/charmaps/855
@@ -1,6 +1,27 @@
 <code_set_name> IBM855
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/857 b/etc/nls/posix/charmaps/857
index 3c3ecfe..a822bdb 100644
--- a/etc/nls/posix/charmaps/857
+++ b/etc/nls/posix/charmaps/857
@@ -1,6 +1,27 @@
 <code_set_name> IBM857
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/86 b/etc/nls/posix/charmaps/86
index 7742976..477f960 100644
--- a/etc/nls/posix/charmaps/86
+++ b/etc/nls/posix/charmaps/86
@@ -1,6 +1,27 @@
 <code_set_name> IBM861
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/860 b/etc/nls/posix/charmaps/860
index c655560..9f0f357 100644
--- a/etc/nls/posix/charmaps/860
+++ b/etc/nls/posix/charmaps/860
@@ -1,6 +1,27 @@
 <code_set_name> IBM860
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/861 b/etc/nls/posix/charmaps/861
index 7742976..477f960 100644
--- a/etc/nls/posix/charmaps/861
+++ b/etc/nls/posix/charmaps/861
@@ -1,6 +1,27 @@
 <code_set_name> IBM861
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/862 b/etc/nls/posix/charmaps/862
index d184e13..66abdc7 100644
--- a/etc/nls/posix/charmaps/862
+++ b/etc/nls/posix/charmaps/862
@@ -1,6 +1,27 @@
 <code_set_name> IBM862
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/863 b/etc/nls/posix/charmaps/863
index 0c488d7..c23368f 100644
--- a/etc/nls/posix/charmaps/863
+++ b/etc/nls/posix/charmaps/863
@@ -1,6 +1,27 @@
 <code_set_name> IBM863
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/865 b/etc/nls/posix/charmaps/865
index db9c0a4..e28bb40 100644
--- a/etc/nls/posix/charmaps/865
+++ b/etc/nls/posix/charmaps/865
@@ -1,6 +1,27 @@
 <code_set_name> IBM865
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987)
diff --git a/etc/nls/posix/charmaps/869 b/etc/nls/posix/charmaps/869
index 5dd4f7d..aba8e4e 100644
--- a/etc/nls/posix/charmaps/869
+++ b/etc/nls/posix/charmaps/869
@@ -1,6 +1,27 @@
 <code_set_name> IBM869
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/87 b/etc/nls/posix/charmaps/87
index d184e13..66abdc7 100644
--- a/etc/nls/posix/charmaps/87
+++ b/etc/nls/posix/charmaps/87
@@ -1,6 +1,27 @@
 <code_set_name> IBM862
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/88 b/etc/nls/posix/charmaps/88
index 0c488d7..c23368f 100644
--- a/etc/nls/posix/charmaps/88
+++ b/etc/nls/posix/charmaps/88
@@ -1,6 +1,27 @@
 <code_set_name> IBM863
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/89 b/etc/nls/posix/charmaps/89
index dab0a2f..84427ee 100644
--- a/etc/nls/posix/charmaps/89
+++ b/etc/nls/posix/charmaps/89
@@ -1,6 +1,27 @@
 <code_set_name> IBM864
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/90 b/etc/nls/posix/charmaps/90
index db9c0a4..e28bb40 100644
--- a/etc/nls/posix/charmaps/90
+++ b/etc/nls/posix/charmaps/90
@@ -1,6 +1,27 @@
 <code_set_name> IBM865
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987)
diff --git a/etc/nls/posix/charmaps/904 b/etc/nls/posix/charmaps/904
index 8c84cb2..33a4d4a 100644
--- a/etc/nls/posix/charmaps/904
+++ b/etc/nls/posix/charmaps/904
@@ -1,6 +1,27 @@
 <code_set_name> IBM904
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/91 b/etc/nls/posix/charmaps/91
index 2b43c4c..eb34e69 100644
--- a/etc/nls/posix/charmaps/91
+++ b/etc/nls/posix/charmaps/91
@@ -1,6 +1,27 @@
 <code_set_name> IBM868
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/92 b/etc/nls/posix/charmaps/92
index 5dd4f7d..aba8e4e 100644
--- a/etc/nls/posix/charmaps/92
+++ b/etc/nls/posix/charmaps/92
@@ -1,6 +1,27 @@
 <code_set_name> IBM869
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/93 b/etc/nls/posix/charmaps/93
index ee260ea..2963d95 100644
--- a/etc/nls/posix/charmaps/93
+++ b/etc/nls/posix/charmaps/93
@@ -1,6 +1,27 @@
 <code_set_name> IBM870
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/94 b/etc/nls/posix/charmaps/94
index 37f7d36..c100bf3 100644
--- a/etc/nls/posix/charmaps/94
+++ b/etc/nls/posix/charmaps/94
@@ -1,6 +1,27 @@
 <code_set_name> IBM871
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/95 b/etc/nls/posix/charmaps/95
index dc0d3a6..b14c85b 100644
--- a/etc/nls/posix/charmaps/95
+++ b/etc/nls/posix/charmaps/95
@@ -1,6 +1,27 @@
 <code_set_name> IBM875
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/96 b/etc/nls/posix/charmaps/96
index 03a4128..686d459 100644
--- a/etc/nls/posix/charmaps/96
+++ b/etc/nls/posix/charmaps/96
@@ -1,6 +1,27 @@
 <code_set_name> IBM880
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/97 b/etc/nls/posix/charmaps/97
index 860df40..3864a7f 100644
--- a/etc/nls/posix/charmaps/97
+++ b/etc/nls/posix/charmaps/97
@@ -1,6 +1,27 @@
 <code_set_name> IBM891
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/98 b/etc/nls/posix/charmaps/98
index 173ec54..1678db7 100644
--- a/etc/nls/posix/charmaps/98
+++ b/etc/nls/posix/charmaps/98
@@ -1,6 +1,27 @@
 <code_set_name> IBM903
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/99 b/etc/nls/posix/charmaps/99
index 8c84cb2..33a4d4a 100644
--- a/etc/nls/posix/charmaps/99
+++ b/etc/nls/posix/charmaps/99
@@ -1,6 +1,27 @@
 <code_set_name> IBM904
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/ANSI_X3.110-1983 b/etc/nls/posix/charmaps/ANSI_X3.110-1983
index 1b7058e..2462e23 100644
--- a/etc/nls/posix/charmaps/ANSI_X3.110-1983
+++ b/etc/nls/posix/charmaps/ANSI_X3.110-1983
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.110-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ANSI_X3.4-1968 b/etc/nls/posix/charmaps/ANSI_X3.4-1968
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/ANSI_X3.4-1968
+++ b/etc/nls/posix/charmaps/ANSI_X3.4-1968
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ANSI_X3.4-1986 b/etc/nls/posix/charmaps/ANSI_X3.4-1986
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/ANSI_X3.4-1986
+++ b/etc/nls/posix/charmaps/ANSI_X3.4-1986
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ARABIC b/etc/nls/posix/charmaps/ARABIC
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/ARABIC
+++ b/etc/nls/posix/charmaps/ARABIC
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ARABIC7 b/etc/nls/posix/charmaps/ARABIC7
index 6ab93e7..90411fb 100644
--- a/etc/nls/posix/charmaps/ARABIC7
+++ b/etc/nls/posix/charmaps/ARABIC7
@@ -1,6 +1,27 @@
 <code_set_name> ASMO_449
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ASCII b/etc/nls/posix/charmaps/ASCII
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/ASCII
+++ b/etc/nls/posix/charmaps/ASCII
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ASMO-708 b/etc/nls/posix/charmaps/ASMO-708
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/ASMO-708
+++ b/etc/nls/posix/charmaps/ASMO-708
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ASMO_449 b/etc/nls/posix/charmaps/ASMO_449
index 6ab93e7..90411fb 100644
--- a/etc/nls/posix/charmaps/ASMO_449
+++ b/etc/nls/posix/charmaps/ASMO_449
@@ -1,6 +1,27 @@
 <code_set_name> ASMO_449
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/BALTIC b/etc/nls/posix/charmaps/BALTIC
index fe38aa9..a875409 100644
--- a/etc/nls/posix/charmaps/BALTIC
+++ b/etc/nls/posix/charmaps/BALTIC
@@ -1,6 +1,27 @@
 <code_set_name> BALTIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/BS_4730 b/etc/nls/posix/charmaps/BS_4730
index 14c6f2d..f26e700 100644
--- a/etc/nls/posix/charmaps/BS_4730
+++ b/etc/nls/posix/charmaps/BS_4730
@@ -1,6 +1,27 @@
 <code_set_name> BS_4730
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/BS_VIEWDATA b/etc/nls/posix/charmaps/BS_VIEWDATA
index 7321d2d..74cdd6c 100644
--- a/etc/nls/posix/charmaps/BS_VIEWDATA
+++ b/etc/nls/posix/charmaps/BS_VIEWDATA
@@ -1,6 +1,27 @@
 <code_set_name> BS_VIEWDATA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CA b/etc/nls/posix/charmaps/CA
index e1ed5a0..5712b28 100644
--- a/etc/nls/posix/charmaps/CA
+++ b/etc/nls/posix/charmaps/CA
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CN b/etc/nls/posix/charmaps/CN
index 8516cf3..d7f7822 100644
--- a/etc/nls/posix/charmaps/CN
+++ b/etc/nls/posix/charmaps/CN
@@ -1,6 +1,27 @@
 <code_set_name> GB_1988-80
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CP-AR b/etc/nls/posix/charmaps/CP-AR
index 2b43c4c..eb34e69 100644
--- a/etc/nls/posix/charmaps/CP-AR
+++ b/etc/nls/posix/charmaps/CP-AR
@@ -1,6 +1,27 @@
 <code_set_name> IBM868
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP-GR b/etc/nls/posix/charmaps/CP-GR
index 5dd4f7d..aba8e4e 100644
--- a/etc/nls/posix/charmaps/CP-GR
+++ b/etc/nls/posix/charmaps/CP-GR
@@ -1,6 +1,27 @@
 <code_set_name> IBM869
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/CP-HU b/etc/nls/posix/charmaps/CP-HU
index f955191..9a6d0a1 100644
--- a/etc/nls/posix/charmaps/CP-HU
+++ b/etc/nls/posix/charmaps/CP-HU
@@ -1,6 +1,27 @@
 <code_set_name> CWI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Computerworld Sza'mita'stechnika vol 3 issue 13 1988-06-29
diff --git a/etc/nls/posix/charmaps/CP-IS b/etc/nls/posix/charmaps/CP-IS
index 7742976..477f960 100644
--- a/etc/nls/posix/charmaps/CP-IS
+++ b/etc/nls/posix/charmaps/CP-IS
@@ -1,6 +1,27 @@
 <code_set_name> IBM861
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP037 b/etc/nls/posix/charmaps/CP037
index 7fadb5e..7b6081c 100644
--- a/etc/nls/posix/charmaps/CP037
+++ b/etc/nls/posix/charmaps/CP037
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP038 b/etc/nls/posix/charmaps/CP038
index 2511c8b..8f4c6fe 100644
--- a/etc/nls/posix/charmaps/CP038
+++ b/etc/nls/posix/charmaps/CP038
@@ -1,6 +1,27 @@
 <code_set_name> IBM038
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/CP1004 b/etc/nls/posix/charmaps/CP1004
index e9d7f63..8ab55ba 100644
--- a/etc/nls/posix/charmaps/CP1004
+++ b/etc/nls/posix/charmaps/CP1004
@@ -1,6 +1,27 @@
 <code_set_name> IBM1004
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: CEN/TC304 N283, 1994-02-04
diff --git a/etc/nls/posix/charmaps/CP1026 b/etc/nls/posix/charmaps/CP1026
index 4530e19..3527c4c 100644
--- a/etc/nls/posix/charmaps/CP1026
+++ b/etc/nls/posix/charmaps/CP1026
@@ -1,6 +1,27 @@
 <code_set_name> IBM1026
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP1047 b/etc/nls/posix/charmaps/CP1047
index ce51e14..11cd277 100644
--- a/etc/nls/posix/charmaps/CP1047
+++ b/etc/nls/posix/charmaps/CP1047
@@ -1,6 +1,27 @@
 <code_set_name> IBM1047
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Character Data Representation Architecture
diff --git a/etc/nls/posix/charmaps/CP1250 b/etc/nls/posix/charmaps/CP1250
index 3c8a7ef..509f57e 100644
--- a/etc/nls/posix/charmaps/CP1250
+++ b/etc/nls/posix/charmaps/CP1250
@@ -1,6 +1,27 @@
 <code_set_name> CP1250
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP1251 b/etc/nls/posix/charmaps/CP1251
index 73f5889..f651c50 100644
--- a/etc/nls/posix/charmaps/CP1251
+++ b/etc/nls/posix/charmaps/CP1251
@@ -1,6 +1,27 @@
 <code_set_name> CP1251
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP1252 b/etc/nls/posix/charmaps/CP1252
index 44824f4..d4948e8 100644
--- a/etc/nls/posix/charmaps/CP1252
+++ b/etc/nls/posix/charmaps/CP1252
@@ -1,6 +1,27 @@
 <code_set_name> CP1252
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP1253 b/etc/nls/posix/charmaps/CP1253
index d8ac293..9a49e5c 100644
--- a/etc/nls/posix/charmaps/CP1253
+++ b/etc/nls/posix/charmaps/CP1253
@@ -1,6 +1,27 @@
 <code_set_name> CP1253
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP1254 b/etc/nls/posix/charmaps/CP1254
index e614632..8861fcb 100644
--- a/etc/nls/posix/charmaps/CP1254
+++ b/etc/nls/posix/charmaps/CP1254
@@ -1,6 +1,27 @@
 <code_set_name> CP1254
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP1255 b/etc/nls/posix/charmaps/CP1255
index dc4e62b..3cfbaed 100644
--- a/etc/nls/posix/charmaps/CP1255
+++ b/etc/nls/posix/charmaps/CP1255
@@ -1,6 +1,27 @@
 <code_set_name> CP1255
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP1256 b/etc/nls/posix/charmaps/CP1256
index 5ac8f08..2450440 100644
--- a/etc/nls/posix/charmaps/CP1256
+++ b/etc/nls/posix/charmaps/CP1256
@@ -1,6 +1,27 @@
 <code_set_name> CP1256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP1257 b/etc/nls/posix/charmaps/CP1257
index 9d00e9c..e00dcf3 100644
--- a/etc/nls/posix/charmaps/CP1257
+++ b/etc/nls/posix/charmaps/CP1257
@@ -1,6 +1,27 @@
 <code_set_name> CP1257
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: CEN/TC304 N283 
diff --git a/etc/nls/posix/charmaps/CP273 b/etc/nls/posix/charmaps/CP273
index 3659455..1fdcfcf 100644
--- a/etc/nls/posix/charmaps/CP273
+++ b/etc/nls/posix/charmaps/CP273
@@ -1,6 +1,27 @@
 <code_set_name> IBM273
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP274 b/etc/nls/posix/charmaps/CP274
index 7fc3ac2..08616e1 100644
--- a/etc/nls/posix/charmaps/CP274
+++ b/etc/nls/posix/charmaps/CP274
@@ -1,6 +1,27 @@
 <code_set_name> IBM274
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/CP275 b/etc/nls/posix/charmaps/CP275
index 71e950d..4b08cc1 100644
--- a/etc/nls/posix/charmaps/CP275
+++ b/etc/nls/posix/charmaps/CP275
@@ -1,6 +1,27 @@
 <code_set_name> IBM275
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP278 b/etc/nls/posix/charmaps/CP278
index d5f2c2c..3a4a408 100644
--- a/etc/nls/posix/charmaps/CP278
+++ b/etc/nls/posix/charmaps/CP278
@@ -1,6 +1,27 @@
 <code_set_name> IBM278
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP280 b/etc/nls/posix/charmaps/CP280
index 1003b27..1c4b691 100644
--- a/etc/nls/posix/charmaps/CP280
+++ b/etc/nls/posix/charmaps/CP280
@@ -1,6 +1,27 @@
 <code_set_name> IBM280
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP281 b/etc/nls/posix/charmaps/CP281
index 40a0770..1900c34 100644
--- a/etc/nls/posix/charmaps/CP281
+++ b/etc/nls/posix/charmaps/CP281
@@ -1,6 +1,27 @@
 <code_set_name> IBM281
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/CP284 b/etc/nls/posix/charmaps/CP284
index 0d388d1..bbd4048 100644
--- a/etc/nls/posix/charmaps/CP284
+++ b/etc/nls/posix/charmaps/CP284
@@ -1,6 +1,27 @@
 <code_set_name> IBM284
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP285 b/etc/nls/posix/charmaps/CP285
index d72c4ae..eac085f 100644
--- a/etc/nls/posix/charmaps/CP285
+++ b/etc/nls/posix/charmaps/CP285
@@ -1,6 +1,27 @@
 <code_set_name> IBM285
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP290 b/etc/nls/posix/charmaps/CP290
index f63ba2f..8722ada 100644
--- a/etc/nls/posix/charmaps/CP290
+++ b/etc/nls/posix/charmaps/CP290
@@ -1,6 +1,27 @@
 <code_set_name> IBM290
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/CP297 b/etc/nls/posix/charmaps/CP297
index 25564a8..31aa5e1 100644
--- a/etc/nls/posix/charmaps/CP297
+++ b/etc/nls/posix/charmaps/CP297
@@ -1,6 +1,27 @@
 <code_set_name> IBM297
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP367 b/etc/nls/posix/charmaps/CP367
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/CP367
+++ b/etc/nls/posix/charmaps/CP367
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CP420 b/etc/nls/posix/charmaps/CP420
index 4bf56c6..8296c7e 100644
--- a/etc/nls/posix/charmaps/CP420
+++ b/etc/nls/posix/charmaps/CP420
@@ -1,6 +1,27 @@
 <code_set_name> IBM420
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP423 b/etc/nls/posix/charmaps/CP423
index b7ea5ed..cacf1b9 100644
--- a/etc/nls/posix/charmaps/CP423
+++ b/etc/nls/posix/charmaps/CP423
@@ -1,6 +1,27 @@
 <code_set_name> IBM423
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP424 b/etc/nls/posix/charmaps/CP424
index 2baee64..e498d73 100644
--- a/etc/nls/posix/charmaps/CP424
+++ b/etc/nls/posix/charmaps/CP424
@@ -1,6 +1,27 @@
 <code_set_name> IBM424
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP437 b/etc/nls/posix/charmaps/CP437
index 3291d3e..61d2535 100644
--- a/etc/nls/posix/charmaps/CP437
+++ b/etc/nls/posix/charmaps/CP437
@@ -1,6 +1,27 @@
 <code_set_name> IBM437
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP500 b/etc/nls/posix/charmaps/CP500
index 3ba99b0..c07b78f 100644
--- a/etc/nls/posix/charmaps/CP500
+++ b/etc/nls/posix/charmaps/CP500
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP819 b/etc/nls/posix/charmaps/CP819
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/CP819
+++ b/etc/nls/posix/charmaps/CP819
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CP850 b/etc/nls/posix/charmaps/CP850
index 3965589..e6a7336 100644
--- a/etc/nls/posix/charmaps/CP850
+++ b/etc/nls/posix/charmaps/CP850
@@ -1,6 +1,27 @@
 <code_set_name> IBM850
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP851 b/etc/nls/posix/charmaps/CP851
index 9c6509f..2548bd8 100644
--- a/etc/nls/posix/charmaps/CP851
+++ b/etc/nls/posix/charmaps/CP851
@@ -1,6 +1,27 @@
 <code_set_name> IBM851
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP852 b/etc/nls/posix/charmaps/CP852
index c7807d2..f4b6dbc 100644
--- a/etc/nls/posix/charmaps/CP852
+++ b/etc/nls/posix/charmaps/CP852
@@ -1,6 +1,27 @@
 <code_set_name> IBM852
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP855 b/etc/nls/posix/charmaps/CP855
index f1af94d..48f1ded 100644
--- a/etc/nls/posix/charmaps/CP855
+++ b/etc/nls/posix/charmaps/CP855
@@ -1,6 +1,27 @@
 <code_set_name> IBM855
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP857 b/etc/nls/posix/charmaps/CP857
index 3c3ecfe..a822bdb 100644
--- a/etc/nls/posix/charmaps/CP857
+++ b/etc/nls/posix/charmaps/CP857
@@ -1,6 +1,27 @@
 <code_set_name> IBM857
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP860 b/etc/nls/posix/charmaps/CP860
index c655560..9f0f357 100644
--- a/etc/nls/posix/charmaps/CP860
+++ b/etc/nls/posix/charmaps/CP860
@@ -1,6 +1,27 @@
 <code_set_name> IBM860
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP861 b/etc/nls/posix/charmaps/CP861
index 7742976..477f960 100644
--- a/etc/nls/posix/charmaps/CP861
+++ b/etc/nls/posix/charmaps/CP861
@@ -1,6 +1,27 @@
 <code_set_name> IBM861
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP862 b/etc/nls/posix/charmaps/CP862
index d184e13..66abdc7 100644
--- a/etc/nls/posix/charmaps/CP862
+++ b/etc/nls/posix/charmaps/CP862
@@ -1,6 +1,27 @@
 <code_set_name> IBM862
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP863 b/etc/nls/posix/charmaps/CP863
index 0c488d7..c23368f 100644
--- a/etc/nls/posix/charmaps/CP863
+++ b/etc/nls/posix/charmaps/CP863
@@ -1,6 +1,27 @@
 <code_set_name> IBM863
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/CP864 b/etc/nls/posix/charmaps/CP864
index dab0a2f..84427ee 100644
--- a/etc/nls/posix/charmaps/CP864
+++ b/etc/nls/posix/charmaps/CP864
@@ -1,6 +1,27 @@
 <code_set_name> IBM864
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/CP865 b/etc/nls/posix/charmaps/CP865
index db9c0a4..e28bb40 100644
--- a/etc/nls/posix/charmaps/CP865
+++ b/etc/nls/posix/charmaps/CP865
@@ -1,6 +1,27 @@
 <code_set_name> IBM865
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987)
diff --git a/etc/nls/posix/charmaps/CP868 b/etc/nls/posix/charmaps/CP868
index 2b43c4c..eb34e69 100644
--- a/etc/nls/posix/charmaps/CP868
+++ b/etc/nls/posix/charmaps/CP868
@@ -1,6 +1,27 @@
 <code_set_name> IBM868
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP869 b/etc/nls/posix/charmaps/CP869
index 5dd4f7d..aba8e4e 100644
--- a/etc/nls/posix/charmaps/CP869
+++ b/etc/nls/posix/charmaps/CP869
@@ -1,6 +1,27 @@
 <code_set_name> IBM869
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/CP870 b/etc/nls/posix/charmaps/CP870
index ee260ea..2963d95 100644
--- a/etc/nls/posix/charmaps/CP870
+++ b/etc/nls/posix/charmaps/CP870
@@ -1,6 +1,27 @@
 <code_set_name> IBM870
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP871 b/etc/nls/posix/charmaps/CP871
index 37f7d36..c100bf3 100644
--- a/etc/nls/posix/charmaps/CP871
+++ b/etc/nls/posix/charmaps/CP871
@@ -1,6 +1,27 @@
 <code_set_name> IBM871
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP875 b/etc/nls/posix/charmaps/CP875
index dc0d3a6..b14c85b 100644
--- a/etc/nls/posix/charmaps/CP875
+++ b/etc/nls/posix/charmaps/CP875
@@ -1,6 +1,27 @@
 <code_set_name> IBM875
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/CP880 b/etc/nls/posix/charmaps/CP880
index 03a4128..686d459 100644
--- a/etc/nls/posix/charmaps/CP880
+++ b/etc/nls/posix/charmaps/CP880
@@ -1,6 +1,27 @@
 <code_set_name> IBM880
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP891 b/etc/nls/posix/charmaps/CP891
index 860df40..3864a7f 100644
--- a/etc/nls/posix/charmaps/CP891
+++ b/etc/nls/posix/charmaps/CP891
@@ -1,6 +1,27 @@
 <code_set_name> IBM891
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP903 b/etc/nls/posix/charmaps/CP903
index 173ec54..1678db7 100644
--- a/etc/nls/posix/charmaps/CP903
+++ b/etc/nls/posix/charmaps/CP903
@@ -1,6 +1,27 @@
 <code_set_name> IBM903
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP904 b/etc/nls/posix/charmaps/CP904
index 8c84cb2..33a4d4a 100644
--- a/etc/nls/posix/charmaps/CP904
+++ b/etc/nls/posix/charmaps/CP904
@@ -1,6 +1,27 @@
 <code_set_name> IBM904
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CP905 b/etc/nls/posix/charmaps/CP905
index 40733dd..ef03b2c 100644
--- a/etc/nls/posix/charmaps/CP905
+++ b/etc/nls/posix/charmaps/CP905
@@ -1,6 +1,27 @@
 <code_set_name> IBM905
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/CP918 b/etc/nls/posix/charmaps/CP918
index 0bb82ba..fff46af 100644
--- a/etc/nls/posix/charmaps/CP918
+++ b/etc/nls/posix/charmaps/CP918
@@ -1,6 +1,27 @@
 <code_set_name> IBM918
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/CSA7-1 b/etc/nls/posix/charmaps/CSA7-1
index e1ed5a0..5712b28 100644
--- a/etc/nls/posix/charmaps/CSA7-1
+++ b/etc/nls/posix/charmaps/CSA7-1
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CSA7-2 b/etc/nls/posix/charmaps/CSA7-2
index 434671e..0669379 100644
--- a/etc/nls/posix/charmaps/CSA7-2
+++ b/etc/nls/posix/charmaps/CSA7-2
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CSA_T500-1983 b/etc/nls/posix/charmaps/CSA_T500-1983
index 1b7058e..2462e23 100644
--- a/etc/nls/posix/charmaps/CSA_T500-1983
+++ b/etc/nls/posix/charmaps/CSA_T500-1983
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.110-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CSA_Z243.4-1985-1 b/etc/nls/posix/charmaps/CSA_Z243.4-1985-1
index e1ed5a0..5712b28 100644
--- a/etc/nls/posix/charmaps/CSA_Z243.4-1985-1
+++ b/etc/nls/posix/charmaps/CSA_Z243.4-1985-1
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CSA_Z243.4-1985-2 b/etc/nls/posix/charmaps/CSA_Z243.4-1985-2
index 434671e..0669379 100644
--- a/etc/nls/posix/charmaps/CSA_Z243.4-1985-2
+++ b/etc/nls/posix/charmaps/CSA_Z243.4-1985-2
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CSA_Z243.4-1985-GR b/etc/nls/posix/charmaps/CSA_Z243.4-1985-GR
index 11f8429..2219f39 100644
--- a/etc/nls/posix/charmaps/CSA_Z243.4-1985-GR
+++ b/etc/nls/posix/charmaps/CSA_Z243.4-1985-GR
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-GR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CSN_369103 b/etc/nls/posix/charmaps/CSN_369103
index afaa080..abc0adc 100644
--- a/etc/nls/posix/charmaps/CSN_369103
+++ b/etc/nls/posix/charmaps/CSN_369103
@@ -1,6 +1,27 @@
 <code_set_name> CSN_369103
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CUBA b/etc/nls/posix/charmaps/CUBA
index a67c0bd..5b21002 100644
--- a/etc/nls/posix/charmaps/CUBA
+++ b/etc/nls/posix/charmaps/CUBA
@@ -1,6 +1,27 @@
 <code_set_name> NC_NC00-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/CWI b/etc/nls/posix/charmaps/CWI
index f955191..9a6d0a1 100644
--- a/etc/nls/posix/charmaps/CWI
+++ b/etc/nls/posix/charmaps/CWI
@@ -1,6 +1,27 @@
 <code_set_name> CWI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Computerworld Sza'mita'stechnika vol 3 issue 13 1988-06-29
diff --git a/etc/nls/posix/charmaps/CWI-2 b/etc/nls/posix/charmaps/CWI-2
index f955191..9a6d0a1 100644
--- a/etc/nls/posix/charmaps/CWI-2
+++ b/etc/nls/posix/charmaps/CWI-2
@@ -1,6 +1,27 @@
 <code_set_name> CWI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Computerworld Sza'mita'stechnika vol 3 issue 13 1988-06-29
diff --git a/etc/nls/posix/charmaps/CYRILLIC b/etc/nls/posix/charmaps/CYRILLIC
index b20160f..9bc968f 100644
--- a/etc/nls/posix/charmaps/CYRILLIC
+++ b/etc/nls/posix/charmaps/CYRILLIC
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-5
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/DE b/etc/nls/posix/charmaps/DE
index b0d2c26..6a973bd 100644
--- a/etc/nls/posix/charmaps/DE
+++ b/etc/nls/posix/charmaps/DE
@@ -1,6 +1,27 @@
 <code_set_name> DIN_66003
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/DEC b/etc/nls/posix/charmaps/DEC
index cef3ae4..edd745e 100644
--- a/etc/nls/posix/charmaps/DEC
+++ b/etc/nls/posix/charmaps/DEC
@@ -1,6 +1,27 @@
 <code_set_name> DEC-MCS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  VAX/VMS User's Manual, Order Number: AI-Y517A-TE, April 1986.
diff --git a/etc/nls/posix/charmaps/DEC-MCS b/etc/nls/posix/charmaps/DEC-MCS
index cef3ae4..edd745e 100644
--- a/etc/nls/posix/charmaps/DEC-MCS
+++ b/etc/nls/posix/charmaps/DEC-MCS
@@ -1,6 +1,27 @@
 <code_set_name> DEC-MCS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  VAX/VMS User's Manual, Order Number: AI-Y517A-TE, April 1986.
diff --git a/etc/nls/posix/charmaps/DIN_66003 b/etc/nls/posix/charmaps/DIN_66003
index b0d2c26..6a973bd 100644
--- a/etc/nls/posix/charmaps/DIN_66003
+++ b/etc/nls/posix/charmaps/DIN_66003
@@ -1,6 +1,27 @@
 <code_set_name> DIN_66003
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/DK b/etc/nls/posix/charmaps/DK
index 9bf632b..39b5b16 100644
--- a/etc/nls/posix/charmaps/DK
+++ b/etc/nls/posix/charmaps/DK
@@ -1,6 +1,27 @@
 <code_set_name> DS_2089
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Danish Standard, DS 2089, February 1974
diff --git a/etc/nls/posix/charmaps/DS2089 b/etc/nls/posix/charmaps/DS2089
index 9bf632b..39b5b16 100644
--- a/etc/nls/posix/charmaps/DS2089
+++ b/etc/nls/posix/charmaps/DS2089
@@ -1,6 +1,27 @@
 <code_set_name> DS_2089
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Danish Standard, DS 2089, February 1974
diff --git a/etc/nls/posix/charmaps/DS_2089 b/etc/nls/posix/charmaps/DS_2089
index 9bf632b..39b5b16 100644
--- a/etc/nls/posix/charmaps/DS_2089
+++ b/etc/nls/posix/charmaps/DS_2089
@@ -1,6 +1,27 @@
 <code_set_name> DS_2089
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Danish Standard, DS 2089, February 1974
diff --git a/etc/nls/posix/charmaps/E13B b/etc/nls/posix/charmaps/E13B
index 1792311..29319ff 100644
--- a/etc/nls/posix/charmaps/E13B
+++ b/etc/nls/posix/charmaps/E13B
@@ -1,6 +1,27 @@
 <code_set_name> ISO_2033-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/EBCDIC-AT-DE b/etc/nls/posix/charmaps/EBCDIC-AT-DE
index 2beafc0..6ab52cf 100644
--- a/etc/nls/posix/charmaps/EBCDIC-AT-DE
+++ b/etc/nls/posix/charmaps/EBCDIC-AT-DE
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-AT-DE
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-AT-DE-A b/etc/nls/posix/charmaps/EBCDIC-AT-DE-A
index 0a344e6..26b7260 100644
--- a/etc/nls/posix/charmaps/EBCDIC-AT-DE-A
+++ b/etc/nls/posix/charmaps/EBCDIC-AT-DE-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-AT-DE-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-BE b/etc/nls/posix/charmaps/EBCDIC-BE
index 7fc3ac2..08616e1 100644
--- a/etc/nls/posix/charmaps/EBCDIC-BE
+++ b/etc/nls/posix/charmaps/EBCDIC-BE
@@ -1,6 +1,27 @@
 <code_set_name> IBM274
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-BR b/etc/nls/posix/charmaps/EBCDIC-BR
index 71e950d..4b08cc1 100644
--- a/etc/nls/posix/charmaps/EBCDIC-BR
+++ b/etc/nls/posix/charmaps/EBCDIC-BR
@@ -1,6 +1,27 @@
 <code_set_name> IBM275
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CA-FR b/etc/nls/posix/charmaps/EBCDIC-CA-FR
index c022339..794a087 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CA-FR
+++ b/etc/nls/posix/charmaps/EBCDIC-CA-FR
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-CA-FR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-AR1 b/etc/nls/posix/charmaps/EBCDIC-CP-AR1
index 4bf56c6..8296c7e 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-AR1
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-AR1
@@ -1,6 +1,27 @@
 <code_set_name> IBM420
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-AR2 b/etc/nls/posix/charmaps/EBCDIC-CP-AR2
index 0bb82ba..fff46af 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-AR2
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-AR2
@@ -1,6 +1,27 @@
 <code_set_name> IBM918
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-BE b/etc/nls/posix/charmaps/EBCDIC-CP-BE
index 3ba99b0..c07b78f 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-BE
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-BE
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-CA b/etc/nls/posix/charmaps/EBCDIC-CP-CA
index 7fadb5e..7b6081c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-CA
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-CA
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-CH b/etc/nls/posix/charmaps/EBCDIC-CP-CH
index 3ba99b0..c07b78f 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-CH
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-CH
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-DK b/etc/nls/posix/charmaps/EBCDIC-CP-DK
index 51a2472..2bf08dc 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-DK
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-DK
@@ -1,6 +1,27 @@
 <code_set_name> IBM277
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-ES b/etc/nls/posix/charmaps/EBCDIC-CP-ES
index 0d388d1..bbd4048 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-ES
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-ES
@@ -1,6 +1,27 @@
 <code_set_name> IBM284
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-FI b/etc/nls/posix/charmaps/EBCDIC-CP-FI
index d5f2c2c..3a4a408 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-FI
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-FI
@@ -1,6 +1,27 @@
 <code_set_name> IBM278
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-FR b/etc/nls/posix/charmaps/EBCDIC-CP-FR
index 25564a8..31aa5e1 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-FR
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-FR
@@ -1,6 +1,27 @@
 <code_set_name> IBM297
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-GB b/etc/nls/posix/charmaps/EBCDIC-CP-GB
index d72c4ae..eac085f 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-GB
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-GB
@@ -1,6 +1,27 @@
 <code_set_name> IBM285
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-GR b/etc/nls/posix/charmaps/EBCDIC-CP-GR
index b7ea5ed..cacf1b9 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-GR
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-GR
@@ -1,6 +1,27 @@
 <code_set_name> IBM423
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-HE b/etc/nls/posix/charmaps/EBCDIC-CP-HE
index 2baee64..e498d73 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-HE
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-HE
@@ -1,6 +1,27 @@
 <code_set_name> IBM424
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-IS b/etc/nls/posix/charmaps/EBCDIC-CP-IS
index 37f7d36..c100bf3 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-IS
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-IS
@@ -1,6 +1,27 @@
 <code_set_name> IBM871
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-IT b/etc/nls/posix/charmaps/EBCDIC-CP-IT
index 1003b27..1c4b691 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-IT
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-IT
@@ -1,6 +1,27 @@
 <code_set_name> IBM280
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-NL b/etc/nls/posix/charmaps/EBCDIC-CP-NL
index 7fadb5e..7b6081c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-NL
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-NL
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-NO b/etc/nls/posix/charmaps/EBCDIC-CP-NO
index 51a2472..2bf08dc 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-NO
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-NO
@@ -1,6 +1,27 @@
 <code_set_name> IBM277
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-ROECE b/etc/nls/posix/charmaps/EBCDIC-CP-ROECE
index ee260ea..2963d95 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-ROECE
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-ROECE
@@ -1,6 +1,27 @@
 <code_set_name> IBM870
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-SE b/etc/nls/posix/charmaps/EBCDIC-CP-SE
index d5f2c2c..3a4a408 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-SE
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-SE
@@ -1,6 +1,27 @@
 <code_set_name> IBM278
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-TR b/etc/nls/posix/charmaps/EBCDIC-CP-TR
index 40733dd..ef03b2c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-TR
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-TR
@@ -1,6 +1,27 @@
 <code_set_name> IBM905
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-US b/etc/nls/posix/charmaps/EBCDIC-CP-US
index 7fadb5e..7b6081c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-US
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-US
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-WT b/etc/nls/posix/charmaps/EBCDIC-CP-WT
index 7fadb5e..7b6081c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-WT
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-WT
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CP-YU b/etc/nls/posix/charmaps/EBCDIC-CP-YU
index ee260ea..2963d95 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CP-YU
+++ b/etc/nls/posix/charmaps/EBCDIC-CP-YU
@@ -1,6 +1,27 @@
 <code_set_name> IBM870
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-CYRILLIC b/etc/nls/posix/charmaps/EBCDIC-CYRILLIC
index 03a4128..686d459 100644
--- a/etc/nls/posix/charmaps/EBCDIC-CYRILLIC
+++ b/etc/nls/posix/charmaps/EBCDIC-CYRILLIC
@@ -1,6 +1,27 @@
 <code_set_name> IBM880
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-DK-NO b/etc/nls/posix/charmaps/EBCDIC-DK-NO
index bd6d44d..5bda476 100644
--- a/etc/nls/posix/charmaps/EBCDIC-DK-NO
+++ b/etc/nls/posix/charmaps/EBCDIC-DK-NO
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-DK-NO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-DK-NO-A b/etc/nls/posix/charmaps/EBCDIC-DK-NO-A
index 9360c6c..37ea9d8 100644
--- a/etc/nls/posix/charmaps/EBCDIC-DK-NO-A
+++ b/etc/nls/posix/charmaps/EBCDIC-DK-NO-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-DK-NO-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-ES b/etc/nls/posix/charmaps/EBCDIC-ES
index cb329d3..028d39e 100644
--- a/etc/nls/posix/charmaps/EBCDIC-ES
+++ b/etc/nls/posix/charmaps/EBCDIC-ES
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-ES-A b/etc/nls/posix/charmaps/EBCDIC-ES-A
index 7a3523a..899b55c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-ES-A
+++ b/etc/nls/posix/charmaps/EBCDIC-ES-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-ES-S b/etc/nls/posix/charmaps/EBCDIC-ES-S
index d861b1f..5f7b2eb 100644
--- a/etc/nls/posix/charmaps/EBCDIC-ES-S
+++ b/etc/nls/posix/charmaps/EBCDIC-ES-S
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-ES-S
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-FI-SE b/etc/nls/posix/charmaps/EBCDIC-FI-SE
index b644379..e86b701 100644
--- a/etc/nls/posix/charmaps/EBCDIC-FI-SE
+++ b/etc/nls/posix/charmaps/EBCDIC-FI-SE
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FI-SE
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-FI-SE-A b/etc/nls/posix/charmaps/EBCDIC-FI-SE-A
index c9920b4..6799d23 100644
--- a/etc/nls/posix/charmaps/EBCDIC-FI-SE-A
+++ b/etc/nls/posix/charmaps/EBCDIC-FI-SE-A
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FI-SE-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-FR b/etc/nls/posix/charmaps/EBCDIC-FR
index 86f0052..5746e08 100644
--- a/etc/nls/posix/charmaps/EBCDIC-FR
+++ b/etc/nls/posix/charmaps/EBCDIC-FR
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-FR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-GREEK b/etc/nls/posix/charmaps/EBCDIC-GREEK
index dc0d3a6..b14c85b 100644
--- a/etc/nls/posix/charmaps/EBCDIC-GREEK
+++ b/etc/nls/posix/charmaps/EBCDIC-GREEK
@@ -1,6 +1,27 @@
 <code_set_name> IBM875
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/EBCDIC-INT b/etc/nls/posix/charmaps/EBCDIC-INT
index 2511c8b..8f4c6fe 100644
--- a/etc/nls/posix/charmaps/EBCDIC-INT
+++ b/etc/nls/posix/charmaps/EBCDIC-INT
@@ -1,6 +1,27 @@
 <code_set_name> IBM038
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-INT1 b/etc/nls/posix/charmaps/EBCDIC-INT1
index b5ec14e..c3b076b 100644
--- a/etc/nls/posix/charmaps/EBCDIC-INT1
+++ b/etc/nls/posix/charmaps/EBCDIC-INT1
@@ -1,6 +1,27 @@
 <code_set_name> IBM256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Registry C-H 3-3220-050
diff --git a/etc/nls/posix/charmaps/EBCDIC-IS-FRISS b/etc/nls/posix/charmaps/EBCDIC-IS-FRISS
index 3ab1f3e..c737c5c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-IS-FRISS
+++ b/etc/nls/posix/charmaps/EBCDIC-IS-FRISS
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-IS-FRISS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Skyrsuvelar Rikisins og Reykjavikurborgar, feb 1982
diff --git a/etc/nls/posix/charmaps/EBCDIC-IT b/etc/nls/posix/charmaps/EBCDIC-IT
index 2dac17e..52bc84c 100644
--- a/etc/nls/posix/charmaps/EBCDIC-IT
+++ b/etc/nls/posix/charmaps/EBCDIC-IT
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-JP-E b/etc/nls/posix/charmaps/EBCDIC-JP-E
index 40a0770..1900c34 100644
--- a/etc/nls/posix/charmaps/EBCDIC-JP-E
+++ b/etc/nls/posix/charmaps/EBCDIC-JP-E
@@ -1,6 +1,27 @@
 <code_set_name> IBM281
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-JP-KANA b/etc/nls/posix/charmaps/EBCDIC-JP-KANA
index f63ba2f..8722ada 100644
--- a/etc/nls/posix/charmaps/EBCDIC-JP-KANA
+++ b/etc/nls/posix/charmaps/EBCDIC-JP-KANA
@@ -1,6 +1,27 @@
 <code_set_name> IBM290
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/EBCDIC-PT b/etc/nls/posix/charmaps/EBCDIC-PT
index 2bddf14..6ef732d 100644
--- a/etc/nls/posix/charmaps/EBCDIC-PT
+++ b/etc/nls/posix/charmaps/EBCDIC-PT
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-PT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-UK b/etc/nls/posix/charmaps/EBCDIC-UK
index 7e2112c..d374dca 100644
--- a/etc/nls/posix/charmaps/EBCDIC-UK
+++ b/etc/nls/posix/charmaps/EBCDIC-UK
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-UK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/EBCDIC-US b/etc/nls/posix/charmaps/EBCDIC-US
index 41722a4..0b6617b 100644
--- a/etc/nls/posix/charmaps/EBCDIC-US
+++ b/etc/nls/posix/charmaps/EBCDIC-US
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-US
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3270 Char Set Ref Ch 10, GA27-2837-9, April 1987
diff --git a/etc/nls/posix/charmaps/ECMA-114 b/etc/nls/posix/charmaps/ECMA-114
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/ECMA-114
+++ b/etc/nls/posix/charmaps/ECMA-114
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ECMA-118 b/etc/nls/posix/charmaps/ECMA-118
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/ECMA-118
+++ b/etc/nls/posix/charmaps/ECMA-118
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ECMA-CYRILLIC b/etc/nls/posix/charmaps/ECMA-CYRILLIC
index 78011d2..f503f68 100644
--- a/etc/nls/posix/charmaps/ECMA-CYRILLIC
+++ b/etc/nls/posix/charmaps/ECMA-CYRILLIC
@@ -1,6 +1,27 @@
 <code_set_name> ECMA-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ELOT_928 b/etc/nls/posix/charmaps/ELOT_928
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/ELOT_928
+++ b/etc/nls/posix/charmaps/ELOT_928
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ES b/etc/nls/posix/charmaps/ES
index ad2ecde..0ac83be 100644
--- a/etc/nls/posix/charmaps/ES
+++ b/etc/nls/posix/charmaps/ES
@@ -1,6 +1,27 @@
 <code_set_name> ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ES2 b/etc/nls/posix/charmaps/ES2
index 17caa7e..1220f35 100644
--- a/etc/nls/posix/charmaps/ES2
+++ b/etc/nls/posix/charmaps/ES2
@@ -1,6 +1,27 @@
 <code_set_name> ES2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/FR b/etc/nls/posix/charmaps/FR
index f75c875..19cdb94 100644
--- a/etc/nls/posix/charmaps/FR
+++ b/etc/nls/posix/charmaps/FR
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/FRISS b/etc/nls/posix/charmaps/FRISS
index 3ab1f3e..c737c5c 100644
--- a/etc/nls/posix/charmaps/FRISS
+++ b/etc/nls/posix/charmaps/FRISS
@@ -1,6 +1,27 @@
 <code_set_name> EBCDIC-IS-FRISS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Skyrsuvelar Rikisins og Reykjavikurborgar, feb 1982
diff --git a/etc/nls/posix/charmaps/GB b/etc/nls/posix/charmaps/GB
index 14c6f2d..f26e700 100644
--- a/etc/nls/posix/charmaps/GB
+++ b/etc/nls/posix/charmaps/GB
@@ -1,6 +1,27 @@
 <code_set_name> BS_4730
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/GB_1988-80 b/etc/nls/posix/charmaps/GB_1988-80
index 8516cf3..d7f7822 100644
--- a/etc/nls/posix/charmaps/GB_1988-80
+++ b/etc/nls/posix/charmaps/GB_1988-80
@@ -1,6 +1,27 @@
 <code_set_name> GB_1988-80
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/GOST_19768-74 b/etc/nls/posix/charmaps/GOST_19768-74
index 591da72..94cb743 100644
--- a/etc/nls/posix/charmaps/GOST_19768-74
+++ b/etc/nls/posix/charmaps/GOST_19768-74
@@ -1,6 +1,27 @@
 <code_set_name> GOST_19768-74
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/GREEK b/etc/nls/posix/charmaps/GREEK
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/GREEK
+++ b/etc/nls/posix/charmaps/GREEK
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/GREEK-CCITT b/etc/nls/posix/charmaps/GREEK-CCITT
index 153589e..0250e61 100644
--- a/etc/nls/posix/charmaps/GREEK-CCITT
+++ b/etc/nls/posix/charmaps/GREEK-CCITT
@@ -1,6 +1,27 @@
 <code_set_name> GREEK-CCITT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/GREEK7 b/etc/nls/posix/charmaps/GREEK7
index 8de7b61..0ce59b3 100644
--- a/etc/nls/posix/charmaps/GREEK7
+++ b/etc/nls/posix/charmaps/GREEK7
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/GREEK7-OLD b/etc/nls/posix/charmaps/GREEK7-OLD
index 125c42e..df1cfd5 100644
--- a/etc/nls/posix/charmaps/GREEK7-OLD
+++ b/etc/nls/posix/charmaps/GREEK7-OLD
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7-OLD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/GREEK8 b/etc/nls/posix/charmaps/GREEK8
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/GREEK8
+++ b/etc/nls/posix/charmaps/GREEK8
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/HEBREW b/etc/nls/posix/charmaps/HEBREW
index a759279..7a18076 100644
--- a/etc/nls/posix/charmaps/HEBREW
+++ b/etc/nls/posix/charmaps/HEBREW
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/HP-ROMAN8 b/etc/nls/posix/charmaps/HP-ROMAN8
index 1e84b7b..68136bc 100644
--- a/etc/nls/posix/charmaps/HP-ROMAN8
+++ b/etc/nls/posix/charmaps/HP-ROMAN8
@@ -1,6 +1,27 @@
 <code_set_name> HP-ROMAN8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: LaserJet IIP Printer User's Manual,
diff --git a/etc/nls/posix/charmaps/HU b/etc/nls/posix/charmaps/HU
index 229857b..e4d9668 100644
--- a/etc/nls/posix/charmaps/HU
+++ b/etc/nls/posix/charmaps/HU
@@ -1,6 +1,27 @@
 <code_set_name> MSZ_7795.3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/IBM037 b/etc/nls/posix/charmaps/IBM037
index 7fadb5e..7b6081c 100644
--- a/etc/nls/posix/charmaps/IBM037
+++ b/etc/nls/posix/charmaps/IBM037
@@ -1,6 +1,27 @@
 <code_set_name> IBM037
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM038 b/etc/nls/posix/charmaps/IBM038
index 2511c8b..8f4c6fe 100644
--- a/etc/nls/posix/charmaps/IBM038
+++ b/etc/nls/posix/charmaps/IBM038
@@ -1,6 +1,27 @@
 <code_set_name> IBM038
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/IBM1004 b/etc/nls/posix/charmaps/IBM1004
index e9d7f63..8ab55ba 100644
--- a/etc/nls/posix/charmaps/IBM1004
+++ b/etc/nls/posix/charmaps/IBM1004
@@ -1,6 +1,27 @@
 <code_set_name> IBM1004
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: CEN/TC304 N283, 1994-02-04
diff --git a/etc/nls/posix/charmaps/IBM1026 b/etc/nls/posix/charmaps/IBM1026
index 4530e19..3527c4c 100644
--- a/etc/nls/posix/charmaps/IBM1026
+++ b/etc/nls/posix/charmaps/IBM1026
@@ -1,6 +1,27 @@
 <code_set_name> IBM1026
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM1047 b/etc/nls/posix/charmaps/IBM1047
index ce51e14..11cd277 100644
--- a/etc/nls/posix/charmaps/IBM1047
+++ b/etc/nls/posix/charmaps/IBM1047
@@ -1,6 +1,27 @@
 <code_set_name> IBM1047
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Character Data Representation Architecture
diff --git a/etc/nls/posix/charmaps/IBM256 b/etc/nls/posix/charmaps/IBM256
index b5ec14e..c3b076b 100644
--- a/etc/nls/posix/charmaps/IBM256
+++ b/etc/nls/posix/charmaps/IBM256
@@ -1,6 +1,27 @@
 <code_set_name> IBM256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Registry C-H 3-3220-050
diff --git a/etc/nls/posix/charmaps/IBM273 b/etc/nls/posix/charmaps/IBM273
index 3659455..1fdcfcf 100644
--- a/etc/nls/posix/charmaps/IBM273
+++ b/etc/nls/posix/charmaps/IBM273
@@ -1,6 +1,27 @@
 <code_set_name> IBM273
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM274 b/etc/nls/posix/charmaps/IBM274
index 7fc3ac2..08616e1 100644
--- a/etc/nls/posix/charmaps/IBM274
+++ b/etc/nls/posix/charmaps/IBM274
@@ -1,6 +1,27 @@
 <code_set_name> IBM274
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/IBM275 b/etc/nls/posix/charmaps/IBM275
index 71e950d..4b08cc1 100644
--- a/etc/nls/posix/charmaps/IBM275
+++ b/etc/nls/posix/charmaps/IBM275
@@ -1,6 +1,27 @@
 <code_set_name> IBM275
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM277 b/etc/nls/posix/charmaps/IBM277
index 51a2472..2bf08dc 100644
--- a/etc/nls/posix/charmaps/IBM277
+++ b/etc/nls/posix/charmaps/IBM277
@@ -1,6 +1,27 @@
 <code_set_name> IBM277
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM278 b/etc/nls/posix/charmaps/IBM278
index d5f2c2c..3a4a408 100644
--- a/etc/nls/posix/charmaps/IBM278
+++ b/etc/nls/posix/charmaps/IBM278
@@ -1,6 +1,27 @@
 <code_set_name> IBM278
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM280 b/etc/nls/posix/charmaps/IBM280
index 1003b27..1c4b691 100644
--- a/etc/nls/posix/charmaps/IBM280
+++ b/etc/nls/posix/charmaps/IBM280
@@ -1,6 +1,27 @@
 <code_set_name> IBM280
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM281 b/etc/nls/posix/charmaps/IBM281
index 40a0770..1900c34 100644
--- a/etc/nls/posix/charmaps/IBM281
+++ b/etc/nls/posix/charmaps/IBM281
@@ -1,6 +1,27 @@
 <code_set_name> IBM281
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/IBM284 b/etc/nls/posix/charmaps/IBM284
index 0d388d1..bbd4048 100644
--- a/etc/nls/posix/charmaps/IBM284
+++ b/etc/nls/posix/charmaps/IBM284
@@ -1,6 +1,27 @@
 <code_set_name> IBM284
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM285 b/etc/nls/posix/charmaps/IBM285
index d72c4ae..eac085f 100644
--- a/etc/nls/posix/charmaps/IBM285
+++ b/etc/nls/posix/charmaps/IBM285
@@ -1,6 +1,27 @@
 <code_set_name> IBM285
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM290 b/etc/nls/posix/charmaps/IBM290
index f63ba2f..8722ada 100644
--- a/etc/nls/posix/charmaps/IBM290
+++ b/etc/nls/posix/charmaps/IBM290
@@ -1,6 +1,27 @@
 <code_set_name> IBM290
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/IBM297 b/etc/nls/posix/charmaps/IBM297
index 25564a8..31aa5e1 100644
--- a/etc/nls/posix/charmaps/IBM297
+++ b/etc/nls/posix/charmaps/IBM297
@@ -1,6 +1,27 @@
 <code_set_name> IBM297
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM367 b/etc/nls/posix/charmaps/IBM367
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/IBM367
+++ b/etc/nls/posix/charmaps/IBM367
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/IBM420 b/etc/nls/posix/charmaps/IBM420
index 4bf56c6..8296c7e 100644
--- a/etc/nls/posix/charmaps/IBM420
+++ b/etc/nls/posix/charmaps/IBM420
@@ -1,6 +1,27 @@
 <code_set_name> IBM420
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM423 b/etc/nls/posix/charmaps/IBM423
index b7ea5ed..cacf1b9 100644
--- a/etc/nls/posix/charmaps/IBM423
+++ b/etc/nls/posix/charmaps/IBM423
@@ -1,6 +1,27 @@
 <code_set_name> IBM423
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM424 b/etc/nls/posix/charmaps/IBM424
index 2baee64..e498d73 100644
--- a/etc/nls/posix/charmaps/IBM424
+++ b/etc/nls/posix/charmaps/IBM424
@@ -1,6 +1,27 @@
 <code_set_name> IBM424
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM437 b/etc/nls/posix/charmaps/IBM437
index 3291d3e..61d2535 100644
--- a/etc/nls/posix/charmaps/IBM437
+++ b/etc/nls/posix/charmaps/IBM437
@@ -1,6 +1,27 @@
 <code_set_name> IBM437
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM500 b/etc/nls/posix/charmaps/IBM500
index 3ba99b0..c07b78f 100644
--- a/etc/nls/posix/charmaps/IBM500
+++ b/etc/nls/posix/charmaps/IBM500
@@ -1,6 +1,27 @@
 <code_set_name> IBM500
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM819 b/etc/nls/posix/charmaps/IBM819
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/IBM819
+++ b/etc/nls/posix/charmaps/IBM819
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/IBM850 b/etc/nls/posix/charmaps/IBM850
index 3965589..e6a7336 100644
--- a/etc/nls/posix/charmaps/IBM850
+++ b/etc/nls/posix/charmaps/IBM850
@@ -1,6 +1,27 @@
 <code_set_name> IBM850
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM851 b/etc/nls/posix/charmaps/IBM851
index 9c6509f..2548bd8 100644
--- a/etc/nls/posix/charmaps/IBM851
+++ b/etc/nls/posix/charmaps/IBM851
@@ -1,6 +1,27 @@
 <code_set_name> IBM851
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM852 b/etc/nls/posix/charmaps/IBM852
index c7807d2..f4b6dbc 100644
--- a/etc/nls/posix/charmaps/IBM852
+++ b/etc/nls/posix/charmaps/IBM852
@@ -1,6 +1,27 @@
 <code_set_name> IBM852
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM855 b/etc/nls/posix/charmaps/IBM855
index f1af94d..48f1ded 100644
--- a/etc/nls/posix/charmaps/IBM855
+++ b/etc/nls/posix/charmaps/IBM855
@@ -1,6 +1,27 @@
 <code_set_name> IBM855
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM857 b/etc/nls/posix/charmaps/IBM857
index 3c3ecfe..a822bdb 100644
--- a/etc/nls/posix/charmaps/IBM857
+++ b/etc/nls/posix/charmaps/IBM857
@@ -1,6 +1,27 @@
 <code_set_name> IBM857
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM860 b/etc/nls/posix/charmaps/IBM860
index c655560..9f0f357 100644
--- a/etc/nls/posix/charmaps/IBM860
+++ b/etc/nls/posix/charmaps/IBM860
@@ -1,6 +1,27 @@
 <code_set_name> IBM860
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM861 b/etc/nls/posix/charmaps/IBM861
index 7742976..477f960 100644
--- a/etc/nls/posix/charmaps/IBM861
+++ b/etc/nls/posix/charmaps/IBM861
@@ -1,6 +1,27 @@
 <code_set_name> IBM861
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM862 b/etc/nls/posix/charmaps/IBM862
index d184e13..66abdc7 100644
--- a/etc/nls/posix/charmaps/IBM862
+++ b/etc/nls/posix/charmaps/IBM862
@@ -1,6 +1,27 @@
 <code_set_name> IBM862
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM863 b/etc/nls/posix/charmaps/IBM863
index 0c488d7..c23368f 100644
--- a/etc/nls/posix/charmaps/IBM863
+++ b/etc/nls/posix/charmaps/IBM863
@@ -1,6 +1,27 @@
 <code_set_name> IBM863
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/IBM864 b/etc/nls/posix/charmaps/IBM864
index dab0a2f..84427ee 100644
--- a/etc/nls/posix/charmaps/IBM864
+++ b/etc/nls/posix/charmaps/IBM864
@@ -1,6 +1,27 @@
 <code_set_name> IBM864
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/IBM865 b/etc/nls/posix/charmaps/IBM865
index db9c0a4..e28bb40 100644
--- a/etc/nls/posix/charmaps/IBM865
+++ b/etc/nls/posix/charmaps/IBM865
@@ -1,6 +1,27 @@
 <code_set_name> IBM865
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM DOS 3.3 Ref (Abridged), 94X9575 (Feb 1987)
diff --git a/etc/nls/posix/charmaps/IBM868 b/etc/nls/posix/charmaps/IBM868
index 2b43c4c..eb34e69 100644
--- a/etc/nls/posix/charmaps/IBM868
+++ b/etc/nls/posix/charmaps/IBM868
@@ -1,6 +1,27 @@
 <code_set_name> IBM868
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM869 b/etc/nls/posix/charmaps/IBM869
index 5dd4f7d..aba8e4e 100644
--- a/etc/nls/posix/charmaps/IBM869
+++ b/etc/nls/posix/charmaps/IBM869
@@ -1,6 +1,27 @@
 <code_set_name> IBM869
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM Keyboard layouts and code pages, PN 07G4586 June 1991
diff --git a/etc/nls/posix/charmaps/IBM870 b/etc/nls/posix/charmaps/IBM870
index ee260ea..2963d95 100644
--- a/etc/nls/posix/charmaps/IBM870
+++ b/etc/nls/posix/charmaps/IBM870
@@ -1,6 +1,27 @@
 <code_set_name> IBM870
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM871 b/etc/nls/posix/charmaps/IBM871
index 37f7d36..c100bf3 100644
--- a/etc/nls/posix/charmaps/IBM871
+++ b/etc/nls/posix/charmaps/IBM871
@@ -1,6 +1,27 @@
 <code_set_name> IBM871
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM875 b/etc/nls/posix/charmaps/IBM875
index dc0d3a6..b14c85b 100644
--- a/etc/nls/posix/charmaps/IBM875
+++ b/etc/nls/posix/charmaps/IBM875
@@ -1,6 +1,27 @@
 <code_set_name> IBM875
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/IBM880 b/etc/nls/posix/charmaps/IBM880
index 03a4128..686d459 100644
--- a/etc/nls/posix/charmaps/IBM880
+++ b/etc/nls/posix/charmaps/IBM880
@@ -1,6 +1,27 @@
 <code_set_name> IBM880
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM891 b/etc/nls/posix/charmaps/IBM891
index 860df40..3864a7f 100644
--- a/etc/nls/posix/charmaps/IBM891
+++ b/etc/nls/posix/charmaps/IBM891
@@ -1,6 +1,27 @@
 <code_set_name> IBM891
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM903 b/etc/nls/posix/charmaps/IBM903
index 173ec54..1678db7 100644
--- a/etc/nls/posix/charmaps/IBM903
+++ b/etc/nls/posix/charmaps/IBM903
@@ -1,6 +1,27 @@
 <code_set_name> IBM903
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM904 b/etc/nls/posix/charmaps/IBM904
index 8c84cb2..33a4d4a 100644
--- a/etc/nls/posix/charmaps/IBM904
+++ b/etc/nls/posix/charmaps/IBM904
@@ -1,6 +1,27 @@
 <code_set_name> IBM904
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IBM905 b/etc/nls/posix/charmaps/IBM905
index 40733dd..ef03b2c 100644
--- a/etc/nls/posix/charmaps/IBM905
+++ b/etc/nls/posix/charmaps/IBM905
@@ -1,6 +1,27 @@
 <code_set_name> IBM905
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM 3174 Character Set Ref, GA27-3831-02, March 1990
diff --git a/etc/nls/posix/charmaps/IBM918 b/etc/nls/posix/charmaps/IBM918
index 0bb82ba..fff46af 100644
--- a/etc/nls/posix/charmaps/IBM918
+++ b/etc/nls/posix/charmaps/IBM918
@@ -1,6 +1,27 @@
 <code_set_name> IBM918
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: IBM NLS RM Vol2 SE09-8002-01, March 1990
diff --git a/etc/nls/posix/charmaps/IEC_P27-1 b/etc/nls/posix/charmaps/IEC_P27-1
index 2eb5330..d76d78a 100644
--- a/etc/nls/posix/charmaps/IEC_P27-1
+++ b/etc/nls/posix/charmaps/IEC_P27-1
@@ -1,6 +1,27 @@
 <code_set_name> IEC_P27-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/INIS b/etc/nls/posix/charmaps/INIS
index 8bc7e9e..c4f3fd9 100644
--- a/etc/nls/posix/charmaps/INIS
+++ b/etc/nls/posix/charmaps/INIS
@@ -1,6 +1,27 @@
 <code_set_name> INIS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/INIS-8 b/etc/nls/posix/charmaps/INIS-8
index 9916a43..81ea4ec 100644
--- a/etc/nls/posix/charmaps/INIS-8
+++ b/etc/nls/posix/charmaps/INIS-8
@@ -1,6 +1,27 @@
 <code_set_name> INIS-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/INIS-CYRILLIC b/etc/nls/posix/charmaps/INIS-CYRILLIC
index cd1e8bf..64714e1 100644
--- a/etc/nls/posix/charmaps/INIS-CYRILLIC
+++ b/etc/nls/posix/charmaps/INIS-CYRILLIC
@@ -1,6 +1,27 @@
 <code_set_name> INIS-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/INVARIANT b/etc/nls/posix/charmaps/INVARIANT
index 20210ca..b86ab24 100644
--- a/etc/nls/posix/charmaps/INVARIANT
+++ b/etc/nls/posix/charmaps/INVARIANT
@@ -1,6 +1,27 @@
 <code_set_name> INVARIANT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias ISO-IR-170
diff --git a/etc/nls/posix/charmaps/IRV b/etc/nls/posix/charmaps/IRV
index 552ceb3..799bc27 100644
--- a/etc/nls/posix/charmaps/IRV
+++ b/etc/nls/posix/charmaps/IRV
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.IRV
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-1 b/etc/nls/posix/charmaps/ISO-8859-1
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/ISO-8859-1
+++ b/etc/nls/posix/charmaps/ISO-8859-1
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-10 b/etc/nls/posix/charmaps/ISO-8859-10
index 9fafa07..40fd161 100644
--- a/etc/nls/posix/charmaps/ISO-8859-10
+++ b/etc/nls/posix/charmaps/ISO-8859-10
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-15 b/etc/nls/posix/charmaps/ISO-8859-15
index fd1831d..af5a2e0 100644
--- a/etc/nls/posix/charmaps/ISO-8859-15
+++ b/etc/nls/posix/charmaps/ISO-8859-15
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-15
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ISO 2375 registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-2 b/etc/nls/posix/charmaps/ISO-8859-2
index fbd66da..31ec21c 100644
--- a/etc/nls/posix/charmaps/ISO-8859-2
+++ b/etc/nls/posix/charmaps/ISO-8859-2
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-3 b/etc/nls/posix/charmaps/ISO-8859-3
index ef86d7a..7de488c 100644
--- a/etc/nls/posix/charmaps/ISO-8859-3
+++ b/etc/nls/posix/charmaps/ISO-8859-3
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-4 b/etc/nls/posix/charmaps/ISO-8859-4
index e8f3c52..70b7bb3 100644
--- a/etc/nls/posix/charmaps/ISO-8859-4
+++ b/etc/nls/posix/charmaps/ISO-8859-4
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-5 b/etc/nls/posix/charmaps/ISO-8859-5
index b20160f..9bc968f 100644
--- a/etc/nls/posix/charmaps/ISO-8859-5
+++ b/etc/nls/posix/charmaps/ISO-8859-5
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-5
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-6 b/etc/nls/posix/charmaps/ISO-8859-6
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/ISO-8859-6
+++ b/etc/nls/posix/charmaps/ISO-8859-6
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-7 b/etc/nls/posix/charmaps/ISO-8859-7
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/ISO-8859-7
+++ b/etc/nls/posix/charmaps/ISO-8859-7
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-8 b/etc/nls/posix/charmaps/ISO-8859-8
index a759279..7a18076 100644
--- a/etc/nls/posix/charmaps/ISO-8859-8
+++ b/etc/nls/posix/charmaps/ISO-8859-8
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-8859-9 b/etc/nls/posix/charmaps/ISO-8859-9
index e63d758..6b222b6 100644
--- a/etc/nls/posix/charmaps/ISO-8859-9
+++ b/etc/nls/posix/charmaps/ISO-8859-9
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-100 b/etc/nls/posix/charmaps/ISO-IR-100
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/ISO-IR-100
+++ b/etc/nls/posix/charmaps/ISO-IR-100
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-101 b/etc/nls/posix/charmaps/ISO-IR-101
index fbd66da..31ec21c 100644
--- a/etc/nls/posix/charmaps/ISO-IR-101
+++ b/etc/nls/posix/charmaps/ISO-IR-101
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-109 b/etc/nls/posix/charmaps/ISO-IR-109
index ef86d7a..7de488c 100644
--- a/etc/nls/posix/charmaps/ISO-IR-109
+++ b/etc/nls/posix/charmaps/ISO-IR-109
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-110 b/etc/nls/posix/charmaps/ISO-IR-110
index e8f3c52..70b7bb3 100644
--- a/etc/nls/posix/charmaps/ISO-IR-110
+++ b/etc/nls/posix/charmaps/ISO-IR-110
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-111 b/etc/nls/posix/charmaps/ISO-IR-111
index 78011d2..f503f68 100644
--- a/etc/nls/posix/charmaps/ISO-IR-111
+++ b/etc/nls/posix/charmaps/ISO-IR-111
@@ -1,6 +1,27 @@
 <code_set_name> ECMA-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-121 b/etc/nls/posix/charmaps/ISO-IR-121
index e1ed5a0..5712b28 100644
--- a/etc/nls/posix/charmaps/ISO-IR-121
+++ b/etc/nls/posix/charmaps/ISO-IR-121
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-122 b/etc/nls/posix/charmaps/ISO-IR-122
index 434671e..0669379 100644
--- a/etc/nls/posix/charmaps/ISO-IR-122
+++ b/etc/nls/posix/charmaps/ISO-IR-122
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-123 b/etc/nls/posix/charmaps/ISO-IR-123
index 11f8429..2219f39 100644
--- a/etc/nls/posix/charmaps/ISO-IR-123
+++ b/etc/nls/posix/charmaps/ISO-IR-123
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-GR
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-126 b/etc/nls/posix/charmaps/ISO-IR-126
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/ISO-IR-126
+++ b/etc/nls/posix/charmaps/ISO-IR-126
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-127 b/etc/nls/posix/charmaps/ISO-IR-127
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/ISO-IR-127
+++ b/etc/nls/posix/charmaps/ISO-IR-127
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-13 b/etc/nls/posix/charmaps/ISO-IR-13
index 2044d0c..432772b 100644
--- a/etc/nls/posix/charmaps/ISO-IR-13
+++ b/etc/nls/posix/charmaps/ISO-IR-13
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-JP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-138 b/etc/nls/posix/charmaps/ISO-IR-138
index a759279..7a18076 100644
--- a/etc/nls/posix/charmaps/ISO-IR-138
+++ b/etc/nls/posix/charmaps/ISO-IR-138
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-139 b/etc/nls/posix/charmaps/ISO-IR-139
index afaa080..abc0adc 100644
--- a/etc/nls/posix/charmaps/ISO-IR-139
+++ b/etc/nls/posix/charmaps/ISO-IR-139
@@ -1,6 +1,27 @@
 <code_set_name> CSN_369103
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-14 b/etc/nls/posix/charmaps/ISO-IR-14
index 279e8d6..e8db92c 100644
--- a/etc/nls/posix/charmaps/ISO-IR-14
+++ b/etc/nls/posix/charmaps/ISO-IR-14
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-RO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-141 b/etc/nls/posix/charmaps/ISO-IR-141
index 7eb6db6..ba12d21 100644
--- a/etc/nls/posix/charmaps/ISO-IR-141
+++ b/etc/nls/posix/charmaps/ISO-IR-141
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.002
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-142 b/etc/nls/posix/charmaps/ISO-IR-142
index b006c3e..a9957a9 100644
--- a/etc/nls/posix/charmaps/ISO-IR-142
+++ b/etc/nls/posix/charmaps/ISO-IR-142
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO 6937-2:1983
diff --git a/etc/nls/posix/charmaps/ISO-IR-143 b/etc/nls/posix/charmaps/ISO-IR-143
index 2eb5330..d76d78a 100644
--- a/etc/nls/posix/charmaps/ISO-IR-143
+++ b/etc/nls/posix/charmaps/ISO-IR-143
@@ -1,6 +1,27 @@
 <code_set_name> IEC_P27-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-144 b/etc/nls/posix/charmaps/ISO-IR-144
index b20160f..9bc968f 100644
--- a/etc/nls/posix/charmaps/ISO-IR-144
+++ b/etc/nls/posix/charmaps/ISO-IR-144
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-5
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-146 b/etc/nls/posix/charmaps/ISO-IR-146
index 0ef72f3..ef5723d 100644
--- a/etc/nls/posix/charmaps/ISO-IR-146
+++ b/etc/nls/posix/charmaps/ISO-IR-146
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-SERB
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-147 b/etc/nls/posix/charmaps/ISO-IR-147
index 3ab5957..3187f43 100644
--- a/etc/nls/posix/charmaps/ISO-IR-147
+++ b/etc/nls/posix/charmaps/ISO-IR-147
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-MAC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-148 b/etc/nls/posix/charmaps/ISO-IR-148
index e63d758..6b222b6 100644
--- a/etc/nls/posix/charmaps/ISO-IR-148
+++ b/etc/nls/posix/charmaps/ISO-IR-148
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-15 b/etc/nls/posix/charmaps/ISO-IR-15
index 196f806..8447955 100644
--- a/etc/nls/posix/charmaps/ISO-IR-15
+++ b/etc/nls/posix/charmaps/ISO-IR-15
@@ -1,6 +1,27 @@
 <code_set_name> IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-150 b/etc/nls/posix/charmaps/ISO-IR-150
index 153589e..0250e61 100644
--- a/etc/nls/posix/charmaps/ISO-IR-150
+++ b/etc/nls/posix/charmaps/ISO-IR-150
@@ -1,6 +1,27 @@
 <code_set_name> GREEK-CCITT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-151 b/etc/nls/posix/charmaps/ISO-IR-151
index a67c0bd..5b21002 100644
--- a/etc/nls/posix/charmaps/ISO-IR-151
+++ b/etc/nls/posix/charmaps/ISO-IR-151
@@ -1,6 +1,27 @@
 <code_set_name> NC_NC00-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-152 b/etc/nls/posix/charmaps/ISO-IR-152
index bdddcb9..15b02e8 100644
--- a/etc/nls/posix/charmaps/ISO-IR-152
+++ b/etc/nls/posix/charmaps/ISO-IR-152
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-25
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-153 b/etc/nls/posix/charmaps/ISO-IR-153
index 591da72..94cb743 100644
--- a/etc/nls/posix/charmaps/ISO-IR-153
+++ b/etc/nls/posix/charmaps/ISO-IR-153
@@ -1,6 +1,27 @@
 <code_set_name> GOST_19768-74
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-154 b/etc/nls/posix/charmaps/ISO-IR-154
index 77afb7b..a0750d5 100644
--- a/etc/nls/posix/charmaps/ISO-IR-154
+++ b/etc/nls/posix/charmaps/ISO-IR-154
@@ -1,6 +1,27 @@
 <code_set_name> ISO_8859-SUPP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-155 b/etc/nls/posix/charmaps/ISO-IR-155
index ee7fee9..934cbd5 100644
--- a/etc/nls/posix/charmaps/ISO-IR-155
+++ b/etc/nls/posix/charmaps/ISO-IR-155
@@ -1,6 +1,27 @@
 <code_set_name> ISO_10367-BOX
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-156 b/etc/nls/posix/charmaps/ISO-IR-156
index e39b7a2..2004501 100644
--- a/etc/nls/posix/charmaps/ISO-IR-156
+++ b/etc/nls/posix/charmaps/ISO-IR-156
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO/IEC 6937:1992
diff --git a/etc/nls/posix/charmaps/ISO-IR-157 b/etc/nls/posix/charmaps/ISO-IR-157
index 9fafa07..40fd161 100644
--- a/etc/nls/posix/charmaps/ISO-IR-157
+++ b/etc/nls/posix/charmaps/ISO-IR-157
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-17 b/etc/nls/posix/charmaps/ISO-IR-17
index ad2ecde..0ac83be 100644
--- a/etc/nls/posix/charmaps/ISO-IR-17
+++ b/etc/nls/posix/charmaps/ISO-IR-17
@@ -1,6 +1,27 @@
 <code_set_name> ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-170 b/etc/nls/posix/charmaps/ISO-IR-170
index 20210ca..b86ab24 100644
--- a/etc/nls/posix/charmaps/ISO-IR-170
+++ b/etc/nls/posix/charmaps/ISO-IR-170
@@ -1,6 +1,27 @@
 <code_set_name> INVARIANT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias ISO-IR-170
diff --git a/etc/nls/posix/charmaps/ISO-IR-179 b/etc/nls/posix/charmaps/ISO-IR-179
index fe38aa9..a875409 100644
--- a/etc/nls/posix/charmaps/ISO-IR-179
+++ b/etc/nls/posix/charmaps/ISO-IR-179
@@ -1,6 +1,27 @@
 <code_set_name> BALTIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-18 b/etc/nls/posix/charmaps/ISO-IR-18
index 125c42e..df1cfd5 100644
--- a/etc/nls/posix/charmaps/ISO-IR-18
+++ b/etc/nls/posix/charmaps/ISO-IR-18
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7-OLD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-19 b/etc/nls/posix/charmaps/ISO-IR-19
index 0caa28a..895c2fa 100644
--- a/etc/nls/posix/charmaps/ISO-IR-19
+++ b/etc/nls/posix/charmaps/ISO-IR-19
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-2 b/etc/nls/posix/charmaps/ISO-IR-2
index 552ceb3..799bc27 100644
--- a/etc/nls/posix/charmaps/ISO-IR-2
+++ b/etc/nls/posix/charmaps/ISO-IR-2
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.IRV
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-21 b/etc/nls/posix/charmaps/ISO-IR-21
index b0d2c26..6a973bd 100644
--- a/etc/nls/posix/charmaps/ISO-IR-21
+++ b/etc/nls/posix/charmaps/ISO-IR-21
@@ -1,6 +1,27 @@
 <code_set_name> DIN_66003
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-27 b/etc/nls/posix/charmaps/ISO-IR-27
index b782acb..3835100 100644
--- a/etc/nls/posix/charmaps/ISO-IR-27
+++ b/etc/nls/posix/charmaps/ISO-IR-27
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-37 b/etc/nls/posix/charmaps/ISO-IR-37
index 1ef9715..073af03 100644
--- a/etc/nls/posix/charmaps/ISO-IR-37
+++ b/etc/nls/posix/charmaps/ISO-IR-37
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-4 b/etc/nls/posix/charmaps/ISO-IR-4
index 14c6f2d..f26e700 100644
--- a/etc/nls/posix/charmaps/ISO-IR-4
+++ b/etc/nls/posix/charmaps/ISO-IR-4
@@ -1,6 +1,27 @@
 <code_set_name> BS_4730
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-47 b/etc/nls/posix/charmaps/ISO-IR-47
index 7321d2d..74cdd6c 100644
--- a/etc/nls/posix/charmaps/ISO-IR-47
+++ b/etc/nls/posix/charmaps/ISO-IR-47
@@ -1,6 +1,27 @@
 <code_set_name> BS_VIEWDATA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-49 b/etc/nls/posix/charmaps/ISO-IR-49
index 8bc7e9e..c4f3fd9 100644
--- a/etc/nls/posix/charmaps/ISO-IR-49
+++ b/etc/nls/posix/charmaps/ISO-IR-49
@@ -1,6 +1,27 @@
 <code_set_name> INIS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-50 b/etc/nls/posix/charmaps/ISO-IR-50
index 9916a43..81ea4ec 100644
--- a/etc/nls/posix/charmaps/ISO-IR-50
+++ b/etc/nls/posix/charmaps/ISO-IR-50
@@ -1,6 +1,27 @@
 <code_set_name> INIS-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-51 b/etc/nls/posix/charmaps/ISO-IR-51
index cd1e8bf..64714e1 100644
--- a/etc/nls/posix/charmaps/ISO-IR-51
+++ b/etc/nls/posix/charmaps/ISO-IR-51
@@ -1,6 +1,27 @@
 <code_set_name> INIS-CYRILLIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-54 b/etc/nls/posix/charmaps/ISO-IR-54
index 3d68966..5e227cc 100644
--- a/etc/nls/posix/charmaps/ISO-IR-54
+++ b/etc/nls/posix/charmaps/ISO-IR-54
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427-EXT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-55 b/etc/nls/posix/charmaps/ISO-IR-55
index 386184d..acff898 100644
--- a/etc/nls/posix/charmaps/ISO-IR-55
+++ b/etc/nls/posix/charmaps/ISO-IR-55
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5428
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-57 b/etc/nls/posix/charmaps/ISO-IR-57
index 8516cf3..d7f7822 100644
--- a/etc/nls/posix/charmaps/ISO-IR-57
+++ b/etc/nls/posix/charmaps/ISO-IR-57
@@ -1,6 +1,27 @@
 <code_set_name> GB_1988-80
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-6 b/etc/nls/posix/charmaps/ISO-IR-6
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/ISO-IR-6
+++ b/etc/nls/posix/charmaps/ISO-IR-6
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-69 b/etc/nls/posix/charmaps/ISO-IR-69
index f75c875..19cdb94 100644
--- a/etc/nls/posix/charmaps/ISO-IR-69
+++ b/etc/nls/posix/charmaps/ISO-IR-69
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-8-1 b/etc/nls/posix/charmaps/ISO-IR-8-1
index 86d0a1f..ab89a36 100644
--- a/etc/nls/posix/charmaps/ISO-IR-8-1
+++ b/etc/nls/posix/charmaps/ISO-IR-8-1
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-8-2 b/etc/nls/posix/charmaps/ISO-IR-8-2
index cd1498b..0a130bf 100644
--- a/etc/nls/posix/charmaps/ISO-IR-8-2
+++ b/etc/nls/posix/charmaps/ISO-IR-8-2
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-85 b/etc/nls/posix/charmaps/ISO-IR-85
index 17caa7e..1220f35 100644
--- a/etc/nls/posix/charmaps/ISO-IR-85
+++ b/etc/nls/posix/charmaps/ISO-IR-85
@@ -1,6 +1,27 @@
 <code_set_name> ES2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-86 b/etc/nls/posix/charmaps/ISO-IR-86
index 229857b..e4d9668 100644
--- a/etc/nls/posix/charmaps/ISO-IR-86
+++ b/etc/nls/posix/charmaps/ISO-IR-86
@@ -1,6 +1,27 @@
 <code_set_name> MSZ_7795.3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-88 b/etc/nls/posix/charmaps/ISO-IR-88
index 8de7b61..0ce59b3 100644
--- a/etc/nls/posix/charmaps/ISO-IR-88
+++ b/etc/nls/posix/charmaps/ISO-IR-88
@@ -1,6 +1,27 @@
 <code_set_name> GREEK7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-89 b/etc/nls/posix/charmaps/ISO-IR-89
index 6ab93e7..90411fb 100644
--- a/etc/nls/posix/charmaps/ISO-IR-89
+++ b/etc/nls/posix/charmaps/ISO-IR-89
@@ -1,6 +1,27 @@
 <code_set_name> ASMO_449
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-9-1 b/etc/nls/posix/charmaps/ISO-IR-9-1
index dcf6474..10dcd15 100644
--- a/etc/nls/posix/charmaps/ISO-IR-9-1
+++ b/etc/nls/posix/charmaps/ISO-IR-9-1
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-9-2 b/etc/nls/posix/charmaps/ISO-IR-9-2
index 58d7d34..8f88ef4 100644
--- a/etc/nls/posix/charmaps/ISO-IR-9-2
+++ b/etc/nls/posix/charmaps/ISO-IR-9-2
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-90 b/etc/nls/posix/charmaps/ISO-IR-90
index b8742d3..ace6895 100644
--- a/etc/nls/posix/charmaps/ISO-IR-90
+++ b/etc/nls/posix/charmaps/ISO-IR-90
@@ -1,6 +1,27 @@
 <code_set_name> ISO-IR-90
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-91 b/etc/nls/posix/charmaps/ISO-IR-91
index 7d77a6c..b8f26b7 100644
--- a/etc/nls/posix/charmaps/ISO-IR-91
+++ b/etc/nls/posix/charmaps/ISO-IR-91
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-92 b/etc/nls/posix/charmaps/ISO-IR-92
index faa9b9b..14a2aa9 100644
--- a/etc/nls/posix/charmaps/ISO-IR-92
+++ b/etc/nls/posix/charmaps/ISO-IR-92
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-93 b/etc/nls/posix/charmaps/ISO-IR-93
index 8c7c383..47b368c 100644
--- a/etc/nls/posix/charmaps/ISO-IR-93
+++ b/etc/nls/posix/charmaps/ISO-IR-93
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-94 b/etc/nls/posix/charmaps/ISO-IR-94
index 5b4be9e..3d76dcd 100644
--- a/etc/nls/posix/charmaps/ISO-IR-94
+++ b/etc/nls/posix/charmaps/ISO-IR-94
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-95 b/etc/nls/posix/charmaps/ISO-IR-95
index 0e494a7..5a91e7d 100644
--- a/etc/nls/posix/charmaps/ISO-IR-95
+++ b/etc/nls/posix/charmaps/ISO-IR-95
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-96 b/etc/nls/posix/charmaps/ISO-IR-96
index 80a3a92..3f8ebe5 100644
--- a/etc/nls/posix/charmaps/ISO-IR-96
+++ b/etc/nls/posix/charmaps/ISO-IR-96
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-KANA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-98 b/etc/nls/posix/charmaps/ISO-IR-98
index 1792311..29319ff 100644
--- a/etc/nls/posix/charmaps/ISO-IR-98
+++ b/etc/nls/posix/charmaps/ISO-IR-98
@@ -1,6 +1,27 @@
 <code_set_name> ISO_2033-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO-IR-99 b/etc/nls/posix/charmaps/ISO-IR-99
index 1b7058e..2462e23 100644
--- a/etc/nls/posix/charmaps/ISO-IR-99
+++ b/etc/nls/posix/charmaps/ISO-IR-99
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.110-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-CA b/etc/nls/posix/charmaps/ISO646-CA
index e1ed5a0..5712b28 100644
--- a/etc/nls/posix/charmaps/ISO646-CA
+++ b/etc/nls/posix/charmaps/ISO646-CA
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-CA2 b/etc/nls/posix/charmaps/ISO646-CA2
index 434671e..0669379 100644
--- a/etc/nls/posix/charmaps/ISO646-CA2
+++ b/etc/nls/posix/charmaps/ISO646-CA2
@@ -1,6 +1,27 @@
 <code_set_name> CSA_Z243.4-1985-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-CN b/etc/nls/posix/charmaps/ISO646-CN
index 8516cf3..d7f7822 100644
--- a/etc/nls/posix/charmaps/ISO646-CN
+++ b/etc/nls/posix/charmaps/ISO646-CN
@@ -1,6 +1,27 @@
 <code_set_name> GB_1988-80
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-CU b/etc/nls/posix/charmaps/ISO646-CU
index a67c0bd..5b21002 100644
--- a/etc/nls/posix/charmaps/ISO646-CU
+++ b/etc/nls/posix/charmaps/ISO646-CU
@@ -1,6 +1,27 @@
 <code_set_name> NC_NC00-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-DE b/etc/nls/posix/charmaps/ISO646-DE
index b0d2c26..6a973bd 100644
--- a/etc/nls/posix/charmaps/ISO646-DE
+++ b/etc/nls/posix/charmaps/ISO646-DE
@@ -1,6 +1,27 @@
 <code_set_name> DIN_66003
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-DK b/etc/nls/posix/charmaps/ISO646-DK
index 9bf632b..39b5b16 100644
--- a/etc/nls/posix/charmaps/ISO646-DK
+++ b/etc/nls/posix/charmaps/ISO646-DK
@@ -1,6 +1,27 @@
 <code_set_name> DS_2089
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Danish Standard, DS 2089, February 1974
diff --git a/etc/nls/posix/charmaps/ISO646-ES b/etc/nls/posix/charmaps/ISO646-ES
index ad2ecde..0ac83be 100644
--- a/etc/nls/posix/charmaps/ISO646-ES
+++ b/etc/nls/posix/charmaps/ISO646-ES
@@ -1,6 +1,27 @@
 <code_set_name> ES
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-ES2 b/etc/nls/posix/charmaps/ISO646-ES2
index 17caa7e..1220f35 100644
--- a/etc/nls/posix/charmaps/ISO646-ES2
+++ b/etc/nls/posix/charmaps/ISO646-ES2
@@ -1,6 +1,27 @@
 <code_set_name> ES2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-FR b/etc/nls/posix/charmaps/ISO646-FR
index f75c875..19cdb94 100644
--- a/etc/nls/posix/charmaps/ISO646-FR
+++ b/etc/nls/posix/charmaps/ISO646-FR
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-GB b/etc/nls/posix/charmaps/ISO646-GB
index 14c6f2d..f26e700 100644
--- a/etc/nls/posix/charmaps/ISO646-GB
+++ b/etc/nls/posix/charmaps/ISO646-GB
@@ -1,6 +1,27 @@
 <code_set_name> BS_4730
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-HU b/etc/nls/posix/charmaps/ISO646-HU
index 229857b..e4d9668 100644
--- a/etc/nls/posix/charmaps/ISO646-HU
+++ b/etc/nls/posix/charmaps/ISO646-HU
@@ -1,6 +1,27 @@
 <code_set_name> MSZ_7795.3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-IT b/etc/nls/posix/charmaps/ISO646-IT
index 196f806..8447955 100644
--- a/etc/nls/posix/charmaps/ISO646-IT
+++ b/etc/nls/posix/charmaps/ISO646-IT
@@ -1,6 +1,27 @@
 <code_set_name> IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-JP b/etc/nls/posix/charmaps/ISO646-JP
index 279e8d6..e8db92c 100644
--- a/etc/nls/posix/charmaps/ISO646-JP
+++ b/etc/nls/posix/charmaps/ISO646-JP
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-RO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-JP-OCR-B b/etc/nls/posix/charmaps/ISO646-JP-OCR-B
index faa9b9b..14a2aa9 100644
--- a/etc/nls/posix/charmaps/ISO646-JP-OCR-B
+++ b/etc/nls/posix/charmaps/ISO646-JP-OCR-B
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-KR b/etc/nls/posix/charmaps/ISO646-KR
index bec7a2e..6e44b75 100644
--- a/etc/nls/posix/charmaps/ISO646-KR
+++ b/etc/nls/posix/charmaps/ISO646-KR
@@ -1,6 +1,27 @@
 <code_set_name> KSC5636
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias ISO646-KR
diff --git a/etc/nls/posix/charmaps/ISO646-US b/etc/nls/posix/charmaps/ISO646-US
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/ISO646-US
+++ b/etc/nls/posix/charmaps/ISO646-US
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO646-YU b/etc/nls/posix/charmaps/ISO646-YU
index 7eb6db6..ba12d21 100644
--- a/etc/nls/posix/charmaps/ISO646-YU
+++ b/etc/nls/posix/charmaps/ISO646-YU
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.002
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO6937 b/etc/nls/posix/charmaps/ISO6937
index e39b7a2..2004501 100644
--- a/etc/nls/posix/charmaps/ISO6937
+++ b/etc/nls/posix/charmaps/ISO6937
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO/IEC 6937:1992
diff --git a/etc/nls/posix/charmaps/ISO_10367-BOX b/etc/nls/posix/charmaps/ISO_10367-BOX
index ee7fee9..934cbd5 100644
--- a/etc/nls/posix/charmaps/ISO_10367-BOX
+++ b/etc/nls/posix/charmaps/ISO_10367-BOX
@@ -1,6 +1,27 @@
 <code_set_name> ISO_10367-BOX
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_2033-1983 b/etc/nls/posix/charmaps/ISO_2033-1983
index 1792311..29319ff 100644
--- a/etc/nls/posix/charmaps/ISO_2033-1983
+++ b/etc/nls/posix/charmaps/ISO_2033-1983
@@ -1,6 +1,27 @@
 <code_set_name> ISO_2033-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_5427 b/etc/nls/posix/charmaps/ISO_5427
index 1ef9715..073af03 100644
--- a/etc/nls/posix/charmaps/ISO_5427
+++ b/etc/nls/posix/charmaps/ISO_5427
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_5427-EXT b/etc/nls/posix/charmaps/ISO_5427-EXT
index 3d68966..5e227cc 100644
--- a/etc/nls/posix/charmaps/ISO_5427-EXT
+++ b/etc/nls/posix/charmaps/ISO_5427-EXT
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427-EXT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_5427.1981 b/etc/nls/posix/charmaps/ISO_5427.1981
index 3d68966..5e227cc 100644
--- a/etc/nls/posix/charmaps/ISO_5427.1981
+++ b/etc/nls/posix/charmaps/ISO_5427.1981
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427-EXT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_5428 b/etc/nls/posix/charmaps/ISO_5428
index 386184d..acff898 100644
--- a/etc/nls/posix/charmaps/ISO_5428
+++ b/etc/nls/posix/charmaps/ISO_5428
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5428
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_5428.1980 b/etc/nls/posix/charmaps/ISO_5428.1980
index 386184d..acff898 100644
--- a/etc/nls/posix/charmaps/ISO_5428.1980
+++ b/etc/nls/posix/charmaps/ISO_5428.1980
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5428
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_646.BASIC b/etc/nls/posix/charmaps/ISO_646.BASIC
index cc38848..fb0ae5e 100644
--- a/etc/nls/posix/charmaps/ISO_646.BASIC
+++ b/etc/nls/posix/charmaps/ISO_646.BASIC
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.BASIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_646.BASIC.1983 b/etc/nls/posix/charmaps/ISO_646.BASIC.1983
index cc38848..fb0ae5e 100644
--- a/etc/nls/posix/charmaps/ISO_646.BASIC.1983
+++ b/etc/nls/posix/charmaps/ISO_646.BASIC.1983
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.BASIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_646.IRV.1983 b/etc/nls/posix/charmaps/ISO_646.IRV.1983
index 552ceb3..799bc27 100644
--- a/etc/nls/posix/charmaps/ISO_646.IRV.1983
+++ b/etc/nls/posix/charmaps/ISO_646.IRV.1983
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.IRV
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_646.IRV.1991 b/etc/nls/posix/charmaps/ISO_646.IRV.1991
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/ISO_646.IRV.1991
+++ b/etc/nls/posix/charmaps/ISO_646.IRV.1991
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_6937 b/etc/nls/posix/charmaps/ISO_6937
index e39b7a2..2004501 100644
--- a/etc/nls/posix/charmaps/ISO_6937
+++ b/etc/nls/posix/charmaps/ISO_6937
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO/IEC 6937:1992
diff --git a/etc/nls/posix/charmaps/ISO_6937-2-25 b/etc/nls/posix/charmaps/ISO_6937-2-25
index bdddcb9..15b02e8 100644
--- a/etc/nls/posix/charmaps/ISO_6937-2-25
+++ b/etc/nls/posix/charmaps/ISO_6937-2-25
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-25
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_6937-2-ADD b/etc/nls/posix/charmaps/ISO_6937-2-ADD
index b006c3e..a9957a9 100644
--- a/etc/nls/posix/charmaps/ISO_6937-2-ADD
+++ b/etc/nls/posix/charmaps/ISO_6937-2-ADD
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937-2-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO 6937-2:1983
diff --git a/etc/nls/posix/charmaps/ISO_6937-2.1983 b/etc/nls/posix/charmaps/ISO_6937-2.1983
index b8742d3..ace6895 100644
--- a/etc/nls/posix/charmaps/ISO_6937-2.1983
+++ b/etc/nls/posix/charmaps/ISO_6937-2.1983
@@ -1,6 +1,27 @@
 <code_set_name> ISO-IR-90
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_6937.1992 b/etc/nls/posix/charmaps/ISO_6937.1992
index e39b7a2..2004501 100644
--- a/etc/nls/posix/charmaps/ISO_6937.1992
+++ b/etc/nls/posix/charmaps/ISO_6937.1992
@@ -1,6 +1,27 @@
 <code_set_name> ISO_6937
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry and ISO/IEC 6937:1992
diff --git a/etc/nls/posix/charmaps/ISO_8859-1 b/etc/nls/posix/charmaps/ISO_8859-1
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/ISO_8859-1
+++ b/etc/nls/posix/charmaps/ISO_8859-1
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-1,GL b/etc/nls/posix/charmaps/ISO_8859-1,GL
index 62d13d9..cd52e02 100644
--- a/etc/nls/posix/charmaps/ISO_8859-1,GL
+++ b/etc/nls/posix/charmaps/ISO_8859-1,GL
@@ -1,3 +1,24 @@
+#########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  License); you may  not use  this file  
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+#########################################################################
 # For use with several test collation definitions, I have produced an
 # 8859.1 charmap, using the standard names in 10646 and related standards.
 # The exceptions are that the "LATIN CAPITAL LETTER A" has been shorted
diff --git a/etc/nls/posix/charmaps/ISO_8859-1.1987 b/etc/nls/posix/charmaps/ISO_8859-1.1987
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/ISO_8859-1.1987
+++ b/etc/nls/posix/charmaps/ISO_8859-1.1987
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-10 b/etc/nls/posix/charmaps/ISO_8859-10
index 9fafa07..40fd161 100644
--- a/etc/nls/posix/charmaps/ISO_8859-10
+++ b/etc/nls/posix/charmaps/ISO_8859-10
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-10.1993 b/etc/nls/posix/charmaps/ISO_8859-10.1993
index 9fafa07..40fd161 100644
--- a/etc/nls/posix/charmaps/ISO_8859-10.1993
+++ b/etc/nls/posix/charmaps/ISO_8859-10.1993
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-2 b/etc/nls/posix/charmaps/ISO_8859-2
index fbd66da..31ec21c 100644
--- a/etc/nls/posix/charmaps/ISO_8859-2
+++ b/etc/nls/posix/charmaps/ISO_8859-2
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-2.1987 b/etc/nls/posix/charmaps/ISO_8859-2.1987
index fbd66da..31ec21c 100644
--- a/etc/nls/posix/charmaps/ISO_8859-2.1987
+++ b/etc/nls/posix/charmaps/ISO_8859-2.1987
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-3 b/etc/nls/posix/charmaps/ISO_8859-3
index ef86d7a..7de488c 100644
--- a/etc/nls/posix/charmaps/ISO_8859-3
+++ b/etc/nls/posix/charmaps/ISO_8859-3
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-3.1988 b/etc/nls/posix/charmaps/ISO_8859-3.1988
index ef86d7a..7de488c 100644
--- a/etc/nls/posix/charmaps/ISO_8859-3.1988
+++ b/etc/nls/posix/charmaps/ISO_8859-3.1988
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-4 b/etc/nls/posix/charmaps/ISO_8859-4
index e8f3c52..70b7bb3 100644
--- a/etc/nls/posix/charmaps/ISO_8859-4
+++ b/etc/nls/posix/charmaps/ISO_8859-4
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-4.1988 b/etc/nls/posix/charmaps/ISO_8859-4.1988
index e8f3c52..70b7bb3 100644
--- a/etc/nls/posix/charmaps/ISO_8859-4.1988
+++ b/etc/nls/posix/charmaps/ISO_8859-4.1988
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-5 b/etc/nls/posix/charmaps/ISO_8859-5
index b20160f..9bc968f 100644
--- a/etc/nls/posix/charmaps/ISO_8859-5
+++ b/etc/nls/posix/charmaps/ISO_8859-5
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-5
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-5.1988 b/etc/nls/posix/charmaps/ISO_8859-5.1988
index b20160f..9bc968f 100644
--- a/etc/nls/posix/charmaps/ISO_8859-5.1988
+++ b/etc/nls/posix/charmaps/ISO_8859-5.1988
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-5
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-6 b/etc/nls/posix/charmaps/ISO_8859-6
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/ISO_8859-6
+++ b/etc/nls/posix/charmaps/ISO_8859-6
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-6.1987 b/etc/nls/posix/charmaps/ISO_8859-6.1987
index d0fb5fa..c2979f9 100644
--- a/etc/nls/posix/charmaps/ISO_8859-6.1987
+++ b/etc/nls/posix/charmaps/ISO_8859-6.1987
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-6
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-7 b/etc/nls/posix/charmaps/ISO_8859-7
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/ISO_8859-7
+++ b/etc/nls/posix/charmaps/ISO_8859-7
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-7.1987 b/etc/nls/posix/charmaps/ISO_8859-7.1987
index 84f5083..93a5e9a 100644
--- a/etc/nls/posix/charmaps/ISO_8859-7.1987
+++ b/etc/nls/posix/charmaps/ISO_8859-7.1987
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-7
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-8 b/etc/nls/posix/charmaps/ISO_8859-8
index a759279..7a18076 100644
--- a/etc/nls/posix/charmaps/ISO_8859-8
+++ b/etc/nls/posix/charmaps/ISO_8859-8
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-8.1988 b/etc/nls/posix/charmaps/ISO_8859-8.1988
index a759279..7a18076 100644
--- a/etc/nls/posix/charmaps/ISO_8859-8.1988
+++ b/etc/nls/posix/charmaps/ISO_8859-8.1988
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-9 b/etc/nls/posix/charmaps/ISO_8859-9
index e63d758..6b222b6 100644
--- a/etc/nls/posix/charmaps/ISO_8859-9
+++ b/etc/nls/posix/charmaps/ISO_8859-9
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-9.1989 b/etc/nls/posix/charmaps/ISO_8859-9.1989
index e63d758..6b222b6 100644
--- a/etc/nls/posix/charmaps/ISO_8859-9.1989
+++ b/etc/nls/posix/charmaps/ISO_8859-9.1989
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_8859-SUPP b/etc/nls/posix/charmaps/ISO_8859-SUPP
index 77afb7b..a0750d5 100644
--- a/etc/nls/posix/charmaps/ISO_8859-SUPP
+++ b/etc/nls/posix/charmaps/ISO_8859-SUPP
@@ -1,6 +1,27 @@
 <code_set_name> ISO_8859-SUPP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ISO_9036 b/etc/nls/posix/charmaps/ISO_9036
index 6ab93e7..90411fb 100644
--- a/etc/nls/posix/charmaps/ISO_9036
+++ b/etc/nls/posix/charmaps/ISO_9036
@@ -1,6 +1,27 @@
 <code_set_name> ASMO_449
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/IT b/etc/nls/posix/charmaps/IT
index 196f806..8447955 100644
--- a/etc/nls/posix/charmaps/IT
+++ b/etc/nls/posix/charmaps/IT
@@ -1,6 +1,27 @@
 <code_set_name> IT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6220-1969 b/etc/nls/posix/charmaps/JIS_C6220-1969
index 2044d0c..432772b 100644
--- a/etc/nls/posix/charmaps/JIS_C6220-1969
+++ b/etc/nls/posix/charmaps/JIS_C6220-1969
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-JP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6220-1969-JP b/etc/nls/posix/charmaps/JIS_C6220-1969-JP
index 2044d0c..432772b 100644
--- a/etc/nls/posix/charmaps/JIS_C6220-1969-JP
+++ b/etc/nls/posix/charmaps/JIS_C6220-1969-JP
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-JP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6220-1969-RO b/etc/nls/posix/charmaps/JIS_C6220-1969-RO
index 279e8d6..e8db92c 100644
--- a/etc/nls/posix/charmaps/JIS_C6220-1969-RO
+++ b/etc/nls/posix/charmaps/JIS_C6220-1969-RO
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-RO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6229-1984-A b/etc/nls/posix/charmaps/JIS_C6229-1984-A
index 7d77a6c..b8f26b7 100644
--- a/etc/nls/posix/charmaps/JIS_C6229-1984-A
+++ b/etc/nls/posix/charmaps/JIS_C6229-1984-A
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6229-1984-B b/etc/nls/posix/charmaps/JIS_C6229-1984-B
index faa9b9b..14a2aa9 100644
--- a/etc/nls/posix/charmaps/JIS_C6229-1984-B
+++ b/etc/nls/posix/charmaps/JIS_C6229-1984-B
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6229-1984-B-ADD b/etc/nls/posix/charmaps/JIS_C6229-1984-B-ADD
index 8c7c383..47b368c 100644
--- a/etc/nls/posix/charmaps/JIS_C6229-1984-B-ADD
+++ b/etc/nls/posix/charmaps/JIS_C6229-1984-B-ADD
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6229-1984-HAND b/etc/nls/posix/charmaps/JIS_C6229-1984-HAND
index 5b4be9e..3d76dcd 100644
--- a/etc/nls/posix/charmaps/JIS_C6229-1984-HAND
+++ b/etc/nls/posix/charmaps/JIS_C6229-1984-HAND
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6229-1984-HAND-ADD b/etc/nls/posix/charmaps/JIS_C6229-1984-HAND-ADD
index 0e494a7..5a91e7d 100644
--- a/etc/nls/posix/charmaps/JIS_C6229-1984-HAND-ADD
+++ b/etc/nls/posix/charmaps/JIS_C6229-1984-HAND-ADD
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_C6229-1984-KANA b/etc/nls/posix/charmaps/JIS_C6229-1984-KANA
index 80a3a92..3f8ebe5 100644
--- a/etc/nls/posix/charmaps/JIS_C6229-1984-KANA
+++ b/etc/nls/posix/charmaps/JIS_C6229-1984-KANA
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-KANA
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JIS_X0201 b/etc/nls/posix/charmaps/JIS_X0201
index f6e9a71..5565045 100644
--- a/etc/nls/posix/charmaps/JIS_X0201
+++ b/etc/nls/posix/charmaps/JIS_X0201
@@ -1,6 +1,27 @@
 <code_set_name> JIS_X0201
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias X0201
diff --git a/etc/nls/posix/charmaps/JP b/etc/nls/posix/charmaps/JP
index 279e8d6..e8db92c 100644
--- a/etc/nls/posix/charmaps/JP
+++ b/etc/nls/posix/charmaps/JP
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-RO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JP-OCR-A b/etc/nls/posix/charmaps/JP-OCR-A
index 7d77a6c..b8f26b7 100644
--- a/etc/nls/posix/charmaps/JP-OCR-A
+++ b/etc/nls/posix/charmaps/JP-OCR-A
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-A
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JP-OCR-B b/etc/nls/posix/charmaps/JP-OCR-B
index faa9b9b..14a2aa9 100644
--- a/etc/nls/posix/charmaps/JP-OCR-B
+++ b/etc/nls/posix/charmaps/JP-OCR-B
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JP-OCR-B-ADD b/etc/nls/posix/charmaps/JP-OCR-B-ADD
index 8c7c383..47b368c 100644
--- a/etc/nls/posix/charmaps/JP-OCR-B-ADD
+++ b/etc/nls/posix/charmaps/JP-OCR-B-ADD
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-B-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JP-OCR-HAND b/etc/nls/posix/charmaps/JP-OCR-HAND
index 5b4be9e..3d76dcd 100644
--- a/etc/nls/posix/charmaps/JP-OCR-HAND
+++ b/etc/nls/posix/charmaps/JP-OCR-HAND
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JP-OCR-HAND-ADD b/etc/nls/posix/charmaps/JP-OCR-HAND-ADD
index 0e494a7..5a91e7d 100644
--- a/etc/nls/posix/charmaps/JP-OCR-HAND-ADD
+++ b/etc/nls/posix/charmaps/JP-OCR-HAND-ADD
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6229-1984-HAND-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JS b/etc/nls/posix/charmaps/JS
index 7eb6db6..ba12d21 100644
--- a/etc/nls/posix/charmaps/JS
+++ b/etc/nls/posix/charmaps/JS
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.002
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JUS_I.B1.002 b/etc/nls/posix/charmaps/JUS_I.B1.002
index 7eb6db6..ba12d21 100644
--- a/etc/nls/posix/charmaps/JUS_I.B1.002
+++ b/etc/nls/posix/charmaps/JUS_I.B1.002
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.002
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JUS_I.B1.003-MAC b/etc/nls/posix/charmaps/JUS_I.B1.003-MAC
index 3ab5957..3187f43 100644
--- a/etc/nls/posix/charmaps/JUS_I.B1.003-MAC
+++ b/etc/nls/posix/charmaps/JUS_I.B1.003-MAC
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-MAC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/JUS_I.B1.003-SERB b/etc/nls/posix/charmaps/JUS_I.B1.003-SERB
index 0ef72f3..ef5723d 100644
--- a/etc/nls/posix/charmaps/JUS_I.B1.003-SERB
+++ b/etc/nls/posix/charmaps/JUS_I.B1.003-SERB
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-SERB
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/KATAKANA b/etc/nls/posix/charmaps/KATAKANA
index 2044d0c..432772b 100644
--- a/etc/nls/posix/charmaps/KATAKANA
+++ b/etc/nls/posix/charmaps/KATAKANA
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-JP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/KOI-7 b/etc/nls/posix/charmaps/KOI-7
index 1ef9715..073af03 100644
--- a/etc/nls/posix/charmaps/KOI-7
+++ b/etc/nls/posix/charmaps/KOI-7
@@ -1,6 +1,27 @@
 <code_set_name> ISO_5427
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/KOI-8 b/etc/nls/posix/charmaps/KOI-8
index 497e1ab..955b42c 100644
--- a/etc/nls/posix/charmaps/KOI-8
+++ b/etc/nls/posix/charmaps/KOI-8
@@ -1,6 +1,27 @@
 <code_set_name> KOI-8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Andrey A. Chernov <ache@astral.msk.su>
diff --git a/etc/nls/posix/charmaps/KOI8-R b/etc/nls/posix/charmaps/KOI8-R
index efddabf..f811408 100644
--- a/etc/nls/posix/charmaps/KOI8-R
+++ b/etc/nls/posix/charmaps/KOI8-R
@@ -1,6 +1,27 @@
 <code_set_name> KOI8-R
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: RFC1489 via Gabor Kiss <kissg@sztaki.hu>
diff --git a/etc/nls/posix/charmaps/KOI8-RU b/etc/nls/posix/charmaps/KOI8-RU
index 58e0275..96c0c32 100644
--- a/etc/nls/posix/charmaps/KOI8-RU
+++ b/etc/nls/posix/charmaps/KOI8-RU
@@ -1,6 +1,27 @@
 <code_set_name> KOI8-RU
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: http://cad.ntu-kpi.kiev.ua/multiling/koi8-ru/
diff --git a/etc/nls/posix/charmaps/KOI8-U b/etc/nls/posix/charmaps/KOI8-U
index 0a6726d..26d3893 100644
--- a/etc/nls/posix/charmaps/KOI8-U
+++ b/etc/nls/posix/charmaps/KOI8-U
@@ -1,6 +1,27 @@
 <code_set_name> KOI8-U
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: RFC 2319
diff --git a/etc/nls/posix/charmaps/KSC5636 b/etc/nls/posix/charmaps/KSC5636
index bec7a2e..6e44b75 100644
--- a/etc/nls/posix/charmaps/KSC5636
+++ b/etc/nls/posix/charmaps/KSC5636
@@ -1,6 +1,27 @@
 <code_set_name> KSC5636
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias ISO646-KR
diff --git a/etc/nls/posix/charmaps/L1 b/etc/nls/posix/charmaps/L1
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/L1
+++ b/etc/nls/posix/charmaps/L1
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/L2 b/etc/nls/posix/charmaps/L2
index fbd66da..31ec21c 100644
--- a/etc/nls/posix/charmaps/L2
+++ b/etc/nls/posix/charmaps/L2
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/L3 b/etc/nls/posix/charmaps/L3
index ef86d7a..7de488c 100644
--- a/etc/nls/posix/charmaps/L3
+++ b/etc/nls/posix/charmaps/L3
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/L4 b/etc/nls/posix/charmaps/L4
index e8f3c52..70b7bb3 100644
--- a/etc/nls/posix/charmaps/L4
+++ b/etc/nls/posix/charmaps/L4
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/L5 b/etc/nls/posix/charmaps/L5
index e63d758..6b222b6 100644
--- a/etc/nls/posix/charmaps/L5
+++ b/etc/nls/posix/charmaps/L5
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/L6 b/etc/nls/posix/charmaps/L6
index 9fafa07..40fd161 100644
--- a/etc/nls/posix/charmaps/L6
+++ b/etc/nls/posix/charmaps/L6
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN-GREEK b/etc/nls/posix/charmaps/LATIN-GREEK
index 0caa28a..895c2fa 100644
--- a/etc/nls/posix/charmaps/LATIN-GREEK
+++ b/etc/nls/posix/charmaps/LATIN-GREEK
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN-GREEK-1 b/etc/nls/posix/charmaps/LATIN-GREEK-1
index b782acb..3835100 100644
--- a/etc/nls/posix/charmaps/LATIN-GREEK-1
+++ b/etc/nls/posix/charmaps/LATIN-GREEK-1
@@ -1,6 +1,27 @@
 <code_set_name> LATIN-GREEK-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN1 b/etc/nls/posix/charmaps/LATIN1
index 61aef57..8b3c7ba 100644
--- a/etc/nls/posix/charmaps/LATIN1
+++ b/etc/nls/posix/charmaps/LATIN1
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN1-2-5 b/etc/nls/posix/charmaps/LATIN1-2-5
index 77afb7b..a0750d5 100644
--- a/etc/nls/posix/charmaps/LATIN1-2-5
+++ b/etc/nls/posix/charmaps/LATIN1-2-5
@@ -1,6 +1,27 @@
 <code_set_name> ISO_8859-SUPP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN2 b/etc/nls/posix/charmaps/LATIN2
index fbd66da..31ec21c 100644
--- a/etc/nls/posix/charmaps/LATIN2
+++ b/etc/nls/posix/charmaps/LATIN2
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN3 b/etc/nls/posix/charmaps/LATIN3
index ef86d7a..7de488c 100644
--- a/etc/nls/posix/charmaps/LATIN3
+++ b/etc/nls/posix/charmaps/LATIN3
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN4 b/etc/nls/posix/charmaps/LATIN4
index e8f3c52..70b7bb3 100644
--- a/etc/nls/posix/charmaps/LATIN4
+++ b/etc/nls/posix/charmaps/LATIN4
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-4
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN5 b/etc/nls/posix/charmaps/LATIN5
index e63d758..6b222b6 100644
--- a/etc/nls/posix/charmaps/LATIN5
+++ b/etc/nls/posix/charmaps/LATIN5
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-9
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/LATIN6 b/etc/nls/posix/charmaps/LATIN6
index 9fafa07..40fd161 100644
--- a/etc/nls/posix/charmaps/LATIN6
+++ b/etc/nls/posix/charmaps/LATIN6
@@ -1,6 +1,27 @@
 <code_set_name> ISO-8859-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/MAC b/etc/nls/posix/charmaps/MAC
index f004165..e93e640 100644
--- a/etc/nls/posix/charmaps/MAC
+++ b/etc/nls/posix/charmaps/MAC
@@ -1,6 +1,27 @@
 <code_set_name> MACINTOSH
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: The Unicode Standard ver 1.0, ISBN 0-201-56788-1, Oct 1991
diff --git a/etc/nls/posix/charmaps/MAC-IS b/etc/nls/posix/charmaps/MAC-IS
index 79ef293..8ec293b 100644
--- a/etc/nls/posix/charmaps/MAC-IS
+++ b/etc/nls/posix/charmaps/MAC-IS
@@ -1,6 +1,27 @@
 <code_set_name> MAC-IS
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 CHARMAP
diff --git a/etc/nls/posix/charmaps/MACEDONIAN b/etc/nls/posix/charmaps/MACEDONIAN
index 3ab5957..3187f43 100644
--- a/etc/nls/posix/charmaps/MACEDONIAN
+++ b/etc/nls/posix/charmaps/MACEDONIAN
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-MAC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/MACINTOSH b/etc/nls/posix/charmaps/MACINTOSH
index f004165..e93e640 100644
--- a/etc/nls/posix/charmaps/MACINTOSH
+++ b/etc/nls/posix/charmaps/MACINTOSH
@@ -1,6 +1,27 @@
 <code_set_name> MACINTOSH
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: The Unicode Standard ver 1.0, ISBN 0-201-56788-1, Oct 1991
diff --git a/etc/nls/posix/charmaps/MS-ANSI b/etc/nls/posix/charmaps/MS-ANSI
index 44824f4..d4948e8 100644
--- a/etc/nls/posix/charmaps/MS-ANSI
+++ b/etc/nls/posix/charmaps/MS-ANSI
@@ -1,6 +1,27 @@
 <code_set_name> CP1252
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/MS-ARAB b/etc/nls/posix/charmaps/MS-ARAB
index 5ac8f08..2450440 100644
--- a/etc/nls/posix/charmaps/MS-ARAB
+++ b/etc/nls/posix/charmaps/MS-ARAB
@@ -1,6 +1,27 @@
 <code_set_name> CP1256
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/MS-CYRL b/etc/nls/posix/charmaps/MS-CYRL
index 73f5889..f651c50 100644
--- a/etc/nls/posix/charmaps/MS-CYRL
+++ b/etc/nls/posix/charmaps/MS-CYRL
@@ -1,6 +1,27 @@
 <code_set_name> CP1251
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/MS-EE b/etc/nls/posix/charmaps/MS-EE
index 3c8a7ef..509f57e 100644
--- a/etc/nls/posix/charmaps/MS-EE
+++ b/etc/nls/posix/charmaps/MS-EE
@@ -1,6 +1,27 @@
 <code_set_name> CP1250
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/MS-GREEK b/etc/nls/posix/charmaps/MS-GREEK
index d8ac293..9a49e5c 100644
--- a/etc/nls/posix/charmaps/MS-GREEK
+++ b/etc/nls/posix/charmaps/MS-GREEK
@@ -1,6 +1,27 @@
 <code_set_name> CP1253
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/MS-HEBR b/etc/nls/posix/charmaps/MS-HEBR
index dc4e62b..3cfbaed 100644
--- a/etc/nls/posix/charmaps/MS-HEBR
+++ b/etc/nls/posix/charmaps/MS-HEBR
@@ -1,6 +1,27 @@
 <code_set_name> CP1255
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/MS-TURK b/etc/nls/posix/charmaps/MS-TURK
index e614632..8861fcb 100644
--- a/etc/nls/posix/charmaps/MS-TURK
+++ b/etc/nls/posix/charmaps/MS-TURK
@@ -1,6 +1,27 @@
 <code_set_name> CP1254
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: UNICODE 1.0
diff --git a/etc/nls/posix/charmaps/MSZ_7795.3 b/etc/nls/posix/charmaps/MSZ_7795.3
index 229857b..e4d9668 100644
--- a/etc/nls/posix/charmaps/MSZ_7795.3
+++ b/etc/nls/posix/charmaps/MSZ_7795.3
@@ -1,6 +1,27 @@
 <code_set_name> MSZ_7795.3
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NAPLPS b/etc/nls/posix/charmaps/NAPLPS
index 1b7058e..2462e23 100644
--- a/etc/nls/posix/charmaps/NAPLPS
+++ b/etc/nls/posix/charmaps/NAPLPS
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.110-1983
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NATS-DANO b/etc/nls/posix/charmaps/NATS-DANO
index dcf6474..10dcd15 100644
--- a/etc/nls/posix/charmaps/NATS-DANO
+++ b/etc/nls/posix/charmaps/NATS-DANO
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NATS-DANO-ADD b/etc/nls/posix/charmaps/NATS-DANO-ADD
index 58d7d34..8f88ef4 100644
--- a/etc/nls/posix/charmaps/NATS-DANO-ADD
+++ b/etc/nls/posix/charmaps/NATS-DANO-ADD
@@ -1,6 +1,27 @@
 <code_set_name> NATS-DANO-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NATS-SEFI b/etc/nls/posix/charmaps/NATS-SEFI
index 86d0a1f..ab89a36 100644
--- a/etc/nls/posix/charmaps/NATS-SEFI
+++ b/etc/nls/posix/charmaps/NATS-SEFI
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NATS-SEFI-ADD b/etc/nls/posix/charmaps/NATS-SEFI-ADD
index cd1498b..0a130bf 100644
--- a/etc/nls/posix/charmaps/NATS-SEFI-ADD
+++ b/etc/nls/posix/charmaps/NATS-SEFI-ADD
@@ -1,6 +1,27 @@
 <code_set_name> NATS-SEFI-ADD
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NC_NC00-10 b/etc/nls/posix/charmaps/NC_NC00-10
index a67c0bd..5b21002 100644
--- a/etc/nls/posix/charmaps/NC_NC00-10
+++ b/etc/nls/posix/charmaps/NC_NC00-10
@@ -1,6 +1,27 @@
 <code_set_name> NC_NC00-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NC_NC00-10.81 b/etc/nls/posix/charmaps/NC_NC00-10.81
index a67c0bd..5b21002 100644
--- a/etc/nls/posix/charmaps/NC_NC00-10.81
+++ b/etc/nls/posix/charmaps/NC_NC00-10.81
@@ -1,6 +1,27 @@
 <code_set_name> NC_NC00-10
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NEXT b/etc/nls/posix/charmaps/NEXT
index 3202e53..66b02ef 100644
--- a/etc/nls/posix/charmaps/NEXT
+++ b/etc/nls/posix/charmaps/NEXT
@@ -1,6 +1,27 @@
 <code_set_name> NEXTSTEP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Peter Svanberg.
diff --git a/etc/nls/posix/charmaps/NEXTSTEP b/etc/nls/posix/charmaps/NEXTSTEP
index 3202e53..66b02ef 100644
--- a/etc/nls/posix/charmaps/NEXTSTEP
+++ b/etc/nls/posix/charmaps/NEXTSTEP
@@ -1,6 +1,27 @@
 <code_set_name> NEXTSTEP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: Peter Svanberg.
diff --git a/etc/nls/posix/charmaps/NF_Z_62-010 b/etc/nls/posix/charmaps/NF_Z_62-010
index f75c875..19cdb94 100644
--- a/etc/nls/posix/charmaps/NF_Z_62-010
+++ b/etc/nls/posix/charmaps/NF_Z_62-010
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NF_Z_62-010_1973 b/etc/nls/posix/charmaps/NF_Z_62-010_1973
index b853d9e..aa879cf 100644
--- a/etc/nls/posix/charmaps/NF_Z_62-010_1973
+++ b/etc/nls/posix/charmaps/NF_Z_62-010_1973
@@ -1,6 +1,27 @@
 <code_set_name> NF_Z_62-010_(1973)
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NS_4551-1 b/etc/nls/posix/charmaps/NS_4551-1
index bdf6617..9151be1 100644
--- a/etc/nls/posix/charmaps/NS_4551-1
+++ b/etc/nls/posix/charmaps/NS_4551-1
@@ -1,6 +1,27 @@
 <code_set_name> NS_4551-1
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/NS_4551-2 b/etc/nls/posix/charmaps/NS_4551-2
index 251da38..bcbc2ac 100644
--- a/etc/nls/posix/charmaps/NS_4551-2
+++ b/etc/nls/posix/charmaps/NS_4551-2
@@ -1,6 +1,27 @@
 <code_set_name> NS_4551-2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/OS2LATIN1 b/etc/nls/posix/charmaps/OS2LATIN1
index e9d7f63..8ab55ba 100644
--- a/etc/nls/posix/charmaps/OS2LATIN1
+++ b/etc/nls/posix/charmaps/OS2LATIN1
@@ -1,6 +1,27 @@
 <code_set_name> IBM1004
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: CEN/TC304 N283, 1994-02-04
diff --git a/etc/nls/posix/charmaps/PT b/etc/nls/posix/charmaps/PT
index 6017742..eb4aa8a 100644
--- a/etc/nls/posix/charmaps/PT
+++ b/etc/nls/posix/charmaps/PT
@@ -1,6 +1,27 @@
 <code_set_name> PT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/PT2 b/etc/nls/posix/charmaps/PT2
index e704d82..60af342 100644
--- a/etc/nls/posix/charmaps/PT2
+++ b/etc/nls/posix/charmaps/PT2
@@ -1,6 +1,27 @@
 <code_set_name> PT2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/R8 b/etc/nls/posix/charmaps/R8
index 1e84b7b..68136bc 100644
--- a/etc/nls/posix/charmaps/R8
+++ b/etc/nls/posix/charmaps/R8
@@ -1,6 +1,27 @@
 <code_set_name> HP-ROMAN8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: LaserJet IIP Printer User's Manual,
diff --git a/etc/nls/posix/charmaps/REF b/etc/nls/posix/charmaps/REF
index cc38848..fb0ae5e 100644
--- a/etc/nls/posix/charmaps/REF
+++ b/etc/nls/posix/charmaps/REF
@@ -1,6 +1,27 @@
 <code_set_name> ISO_646.BASIC
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ROMAN8 b/etc/nls/posix/charmaps/ROMAN8
index 1e84b7b..68136bc 100644
--- a/etc/nls/posix/charmaps/ROMAN8
+++ b/etc/nls/posix/charmaps/ROMAN8
@@ -1,6 +1,27 @@
 <code_set_name> HP-ROMAN8
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: LaserJet IIP Printer User's Manual,
diff --git a/etc/nls/posix/charmaps/SAMI b/etc/nls/posix/charmaps/SAMI
index d24de26..5a5abdd 100644
--- a/etc/nls/posix/charmaps/SAMI
+++ b/etc/nls/posix/charmaps/SAMI
@@ -1,6 +1,27 @@
 <code_set_name> SAMI
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/SEN_850200_B b/etc/nls/posix/charmaps/SEN_850200_B
index bbe8e20..1f74533 100644
--- a/etc/nls/posix/charmaps/SEN_850200_B
+++ b/etc/nls/posix/charmaps/SEN_850200_B
@@ -1,6 +1,27 @@
 <code_set_name> SEN_850200_B
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/SEN_850200_C b/etc/nls/posix/charmaps/SEN_850200_C
index 2bce77e..87d3964 100644
--- a/etc/nls/posix/charmaps/SEN_850200_C
+++ b/etc/nls/posix/charmaps/SEN_850200_C
@@ -1,6 +1,27 @@
 <code_set_name> SEN_850200_C
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/SERBIAN b/etc/nls/posix/charmaps/SERBIAN
index 0ef72f3..ef5723d 100644
--- a/etc/nls/posix/charmaps/SERBIAN
+++ b/etc/nls/posix/charmaps/SERBIAN
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.003-SERB
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/ST_SEV_358-88 b/etc/nls/posix/charmaps/ST_SEV_358-88
index 591da72..94cb743 100644
--- a/etc/nls/posix/charmaps/ST_SEV_358-88
+++ b/etc/nls/posix/charmaps/ST_SEV_358-88
@@ -1,6 +1,27 @@
 <code_set_name> GOST_19768-74
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/T.101-G2 b/etc/nls/posix/charmaps/T.101-G2
index 5af8155..6266489 100644
--- a/etc/nls/posix/charmaps/T.101-G2
+++ b/etc/nls/posix/charmaps/T.101-G2
@@ -1,6 +1,27 @@
 <code_set_name> T.101-G2
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/T.61-7BIT b/etc/nls/posix/charmaps/T.61-7BIT
index e78c0ab..92faae4 100644
--- a/etc/nls/posix/charmaps/T.61-7BIT
+++ b/etc/nls/posix/charmaps/T.61-7BIT
@@ -1,6 +1,27 @@
 <code_set_name> T.61-7BIT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/T.61-8BIT b/etc/nls/posix/charmaps/T.61-8BIT
index 95b0b63..562e8a0 100644
--- a/etc/nls/posix/charmaps/T.61-8BIT
+++ b/etc/nls/posix/charmaps/T.61-8BIT
@@ -1,6 +1,27 @@
 <code_set_name> T.61-8BIT
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias T.61
diff --git a/etc/nls/posix/charmaps/UK b/etc/nls/posix/charmaps/UK
index 14c6f2d..f26e700 100644
--- a/etc/nls/posix/charmaps/UK
+++ b/etc/nls/posix/charmaps/UK
@@ -1,6 +1,27 @@
 <code_set_name> BS_4730
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/US b/etc/nls/posix/charmaps/US
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/US
+++ b/etc/nls/posix/charmaps/US
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/US-ASCII b/etc/nls/posix/charmaps/US-ASCII
index 10a849f..7b0dc1c 100644
--- a/etc/nls/posix/charmaps/US-ASCII
+++ b/etc/nls/posix/charmaps/US-ASCII
@@ -1,6 +1,27 @@
 <code_set_name> ANSI_X3.4-1968
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/VIDEOTEX-SUPPL b/etc/nls/posix/charmaps/VIDEOTEX-SUPPL
index 989886a..39d691e 100644
--- a/etc/nls/posix/charmaps/VIDEOTEX-SUPPL
+++ b/etc/nls/posix/charmaps/VIDEOTEX-SUPPL
@@ -1,6 +1,27 @@
 <code_set_name> VIDEOTEX-SUPPL
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/WINBALTRIM b/etc/nls/posix/charmaps/WINBALTRIM
index 9d00e9c..e00dcf3 100644
--- a/etc/nls/posix/charmaps/WINBALTRIM
+++ b/etc/nls/posix/charmaps/WINBALTRIM
@@ -1,6 +1,27 @@
 <code_set_name> CP1257
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: CEN/TC304 N283 
diff --git a/etc/nls/posix/charmaps/X0201 b/etc/nls/posix/charmaps/X0201
index f6e9a71..5565045 100644
--- a/etc/nls/posix/charmaps/X0201
+++ b/etc/nls/posix/charmaps/X0201
@@ -1,6 +1,27 @@
 <code_set_name> JIS_X0201
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 % alias X0201
diff --git a/etc/nls/posix/charmaps/X0201-7 b/etc/nls/posix/charmaps/X0201-7
index 2044d0c..432772b 100644
--- a/etc/nls/posix/charmaps/X0201-7
+++ b/etc/nls/posix/charmaps/X0201-7
@@ -1,6 +1,27 @@
 <code_set_name> JIS_C6220-1969-JP
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/charmaps/YU b/etc/nls/posix/charmaps/YU
index 7eb6db6..ba12d21 100644
--- a/etc/nls/posix/charmaps/YU
+++ b/etc/nls/posix/charmaps/YU
@@ -1,6 +1,27 @@
 <code_set_name> JUS_I.B1.002
 <comment_char> %
 <escape_char> /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % version: 1.0
 % repertoiremap: mnemonic,ds
 %  source: ECMA registry
diff --git a/etc/nls/posix/src/POSIX b/etc/nls/posix/src/POSIX
index 21b09e6..ea123c0 100644
--- a/etc/nls/posix/src/POSIX
+++ b/etc/nls/posix/src/POSIX
@@ -1,3 +1,25 @@
+###########################################################################
+# 
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  "License"); you may  not use  this file
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 2001-2007 Rogue Wave Software.
+#
+###########################################################################
+#
 # POSIX Standard Locale
 #
 # As per ISO/IEC 9945-2:1993 specifications
diff --git a/etc/nls/posix/src/cs_CZ b/etc/nls/posix/src/cs_CZ
index 889d4ac..0cdb361 100644
--- a/etc/nls/posix/src/cs_CZ
+++ b/etc/nls/posix/src/cs_CZ
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Czech language locale for Czech Republic
 % Source: RAP
diff --git a/etc/nls/posix/src/da_DK b/etc/nls/posix/src/da_DK
index 289a179..bda4ee7 100644
--- a/etc/nls/posix/src/da_DK
+++ b/etc/nls/posix/src/da_DK
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Danish language locale for Denmark
 % Source: Danish Standards Association
 % Address: Kollegievej 6
diff --git a/etc/nls/posix/src/da_EU b/etc/nls/posix/src/da_EU
index 8a41640..526016e 100644
--- a/etc/nls/posix/src/da_EU
+++ b/etc/nls/posix/src/da_EU
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Danish language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
 % Address: rue de Stassart, 36
diff --git a/etc/nls/posix/src/de_AT b/etc/nls/posix/src/de_AT
index 2c75d68..a052cd0 100644
--- a/etc/nls/posix/src/de_AT
+++ b/etc/nls/posix/src/de_AT
@@ -1,6 +1,27 @@
 comment_char %
-escape_char  /
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % German Language Locale for Austria
 % Source: O:sterreiches Normungsinstitut
 % Address: Postfach 130, A-1021 Wien
diff --git a/etc/nls/posix/src/de_BE b/etc/nls/posix/src/de_BE
index 953b04b..98f9b6c 100644
--- a/etc/nls/posix/src/de_BE
+++ b/etc/nls/posix/src/de_BE
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Belgium
 % Source: RAP
diff --git a/etc/nls/posix/src/de_CH b/etc/nls/posix/src/de_CH
index 3f4f675..8507c27 100644
--- a/etc/nls/posix/src/de_CH
+++ b/etc/nls/posix/src/de_CH
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Switzerland
 % Source: RAP
diff --git a/etc/nls/posix/src/de_DE b/etc/nls/posix/src/de_DE
index 94e0c2a..c2c44a3 100644
--- a/etc/nls/posix/src/de_DE
+++ b/etc/nls/posix/src/de_DE
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Germany
 % Source: RAP
diff --git a/etc/nls/posix/src/de_EU b/etc/nls/posix/src/de_EU
index 86b3a0c..a7acd2c 100644
--- a/etc/nls/posix/src/de_EU
+++ b/etc/nls/posix/src/de_EU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
diff --git a/etc/nls/posix/src/de_LU b/etc/nls/posix/src/de_LU
index 6ba48df..ca14bbd 100644
--- a/etc/nls/posix/src/de_LU
+++ b/etc/nls/posix/src/de_LU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Luxemburg
 % Source: RAP
diff --git a/etc/nls/posix/src/el_EU b/etc/nls/posix/src/el_EU
index 65fa3db..10a59fd 100644
--- a/etc/nls/posix/src/el_EU
+++ b/etc/nls/posix/src/el_EU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Greek language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
diff --git a/etc/nls/posix/src/el_GR b/etc/nls/posix/src/el_GR
index 41f6822..39dc0db 100644
--- a/etc/nls/posix/src/el_GR
+++ b/etc/nls/posix/src/el_GR
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Greek Language Locale for Greece
 % Source: RAP
diff --git a/etc/nls/posix/src/en_AU b/etc/nls/posix/src/en_AU
index 14a8ef6..78efa75 100644
--- a/etc/nls/posix/src/en_AU
+++ b/etc/nls/posix/src/en_AU
@@ -1,6 +1,27 @@
-escape_char  /
-comment_char  %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Australia
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/posix/src/en_CA b/etc/nls/posix/src/en_CA
index 4c33760..4870fae 100644
--- a/etc/nls/posix/src/en_CA
+++ b/etc/nls/posix/src/en_CA
@@ -1,6 +1,27 @@
-escape_char  /
-comment_char  %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Canada
 % sorting according to CAN/CSA-Z243.4.1-1992
 % Source: RAP
diff --git a/etc/nls/posix/src/en_DK b/etc/nls/posix/src/en_DK
index c6777d2..03688dc 100644
--- a/etc/nls/posix/src/en_DK
+++ b/etc/nls/posix/src/en_DK
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Denmark
 %
 % Written according to POSIX.2
diff --git a/etc/nls/posix/src/en_EU b/etc/nls/posix/src/en_EU
index 27413c8..b6aae28 100644
--- a/etc/nls/posix/src/en_EU
+++ b/etc/nls/posix/src/en_EU
@@ -1,6 +1,27 @@
-escape_char  /
-comment_char  %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
 % Address: rue de Stassart, 36
diff --git a/etc/nls/posix/src/en_GB b/etc/nls/posix/src/en_GB
index 0889897..719ee78 100644
--- a/etc/nls/posix/src/en_GB
+++ b/etc/nls/posix/src/en_GB
@@ -1,6 +1,27 @@
-escape_char  /
-comment_char  %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Britain
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/posix/src/en_IE b/etc/nls/posix/src/en_IE
index 9f4670f..7658e43 100644
--- a/etc/nls/posix/src/en_IE
+++ b/etc/nls/posix/src/en_IE
@@ -1,6 +1,27 @@
-escape_char  /
-comment_char  %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Ireland
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/posix/src/en_NZ b/etc/nls/posix/src/en_NZ
index 938f4c1..a0edc79 100644
--- a/etc/nls/posix/src/en_NZ
+++ b/etc/nls/posix/src/en_NZ
@@ -1,6 +1,27 @@
-escape_char  /
-comment_char  %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for New Zealand
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/posix/src/en_US b/etc/nls/posix/src/en_US
index 60d8502..50042b3 100644
--- a/etc/nls/posix/src/en_US
+++ b/etc/nls/posix/src/en_US
@@ -1,6 +1,27 @@
-escape_char  /
-comment_char  %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for USA
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/posix/src/es_AR b/etc/nls/posix/src/es_AR
index b7d4ad8..8b60b46 100644
--- a/etc/nls/posix/src/es_AR
+++ b/etc/nls/posix/src/es_AR
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Argentina
 % Source: RAP
diff --git a/etc/nls/posix/src/es_BO b/etc/nls/posix/src/es_BO
index 62991c8..8c475d1 100644
--- a/etc/nls/posix/src/es_BO
+++ b/etc/nls/posix/src/es_BO
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Bolivia
 % Source: RAP
diff --git a/etc/nls/posix/src/es_CL b/etc/nls/posix/src/es_CL
index fb526dd..156253e 100644
--- a/etc/nls/posix/src/es_CL
+++ b/etc/nls/posix/src/es_CL
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Chile
 % Source: RAP
diff --git a/etc/nls/posix/src/es_CO b/etc/nls/posix/src/es_CO
index 5ce1817..7b7dcfd 100644
--- a/etc/nls/posix/src/es_CO
+++ b/etc/nls/posix/src/es_CO
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Colombia
 % Source: RAP
diff --git a/etc/nls/posix/src/es_DO b/etc/nls/posix/src/es_DO
index 7d0c864..f6eb6e5 100644
--- a/etc/nls/posix/src/es_DO
+++ b/etc/nls/posix/src/es_DO
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Dominican Republic
 % Source: RAP
diff --git a/etc/nls/posix/src/es_EC b/etc/nls/posix/src/es_EC
index 61796c3..18d7b79 100644
--- a/etc/nls/posix/src/es_EC
+++ b/etc/nls/posix/src/es_EC
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish Language Locale for Equador
 % Source: RAP
diff --git a/etc/nls/posix/src/es_ES b/etc/nls/posix/src/es_ES
index 296271b..3f7cac8 100644
--- a/etc/nls/posix/src/es_ES
+++ b/etc/nls/posix/src/es_ES
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish Language Locale for Spain
 % Source: RAP
diff --git a/etc/nls/posix/src/es_EU b/etc/nls/posix/src/es_EU
index c46403e..1cb32d8 100644
--- a/etc/nls/posix/src/es_EU
+++ b/etc/nls/posix/src/es_EU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
diff --git a/etc/nls/posix/src/es_GT b/etc/nls/posix/src/es_GT
index 6bb0f87..4991ec4 100644
--- a/etc/nls/posix/src/es_GT
+++ b/etc/nls/posix/src/es_GT
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Guatemala
 % Source: RAP
diff --git a/etc/nls/posix/src/es_HN b/etc/nls/posix/src/es_HN
index e790a3c..779aeca 100644
--- a/etc/nls/posix/src/es_HN
+++ b/etc/nls/posix/src/es_HN
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Honduras
 % Source: RAP
diff --git a/etc/nls/posix/src/es_MX b/etc/nls/posix/src/es_MX
index f44e1bf..2a4ac22 100644
--- a/etc/nls/posix/src/es_MX
+++ b/etc/nls/posix/src/es_MX
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Mexico
 % Source: RAP
diff --git a/etc/nls/posix/src/es_PA b/etc/nls/posix/src/es_PA
index 36d0132..a61a2ea 100644
--- a/etc/nls/posix/src/es_PA
+++ b/etc/nls/posix/src/es_PA
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Panama
 % Source: RAP
diff --git a/etc/nls/posix/src/es_PE b/etc/nls/posix/src/es_PE
index 8cf096f..6d2e1c2 100644
--- a/etc/nls/posix/src/es_PE
+++ b/etc/nls/posix/src/es_PE
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Peru
 % Source: RAP
diff --git a/etc/nls/posix/src/es_PY b/etc/nls/posix/src/es_PY
index cf835b5..080f789 100644
--- a/etc/nls/posix/src/es_PY
+++ b/etc/nls/posix/src/es_PY
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Paraguay
 % Source: RAP
diff --git a/etc/nls/posix/src/es_SV b/etc/nls/posix/src/es_SV
index 87a2432..3cbe89e 100644
--- a/etc/nls/posix/src/es_SV
+++ b/etc/nls/posix/src/es_SV
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for El Salvador
 % Source: RAP
diff --git a/etc/nls/posix/src/es_US b/etc/nls/posix/src/es_US
index 008ea31..a37b859 100644
--- a/etc/nls/posix/src/es_US
+++ b/etc/nls/posix/src/es_US
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish Language Locale for U.S.A.
 % Source: RAP
diff --git a/etc/nls/posix/src/es_UY b/etc/nls/posix/src/es_UY
index 294de08..ad293c2 100644
--- a/etc/nls/posix/src/es_UY
+++ b/etc/nls/posix/src/es_UY
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Uruguay
 % Source: RAP
diff --git a/etc/nls/posix/src/es_VE b/etc/nls/posix/src/es_VE
index 84b6435..a9c4174 100644
--- a/etc/nls/posix/src/es_VE
+++ b/etc/nls/posix/src/es_VE
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Venezuela
 % Source: RAP
diff --git a/etc/nls/posix/src/et_EE b/etc/nls/posix/src/et_EE
index d4d53bb..9fc3fa5 100644
--- a/etc/nls/posix/src/et_EE
+++ b/etc/nls/posix/src/et_EE
@@ -1,6 +1,27 @@
-escape_char  /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Estonian language locale for Estonia
 % according to EVS 8:1993
 % Source: Estonian Informatics Fund
diff --git a/etc/nls/posix/src/eu_ES b/etc/nls/posix/src/eu_ES
index 673b140..7db9844 100644
--- a/etc/nls/posix/src/eu_ES
+++ b/etc/nls/posix/src/eu_ES
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Basque Language Locale for Spain
 % Source: RAP
diff --git a/etc/nls/posix/src/fi_EU b/etc/nls/posix/src/fi_EU
index e9a0056..db62f01 100644
--- a/etc/nls/posix/src/fi_EU
+++ b/etc/nls/posix/src/fi_EU
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Finnish language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
 % Address: rue de Stassart, 36
diff --git a/etc/nls/posix/src/fi_FI b/etc/nls/posix/src/fi_FI
index e086cd2..5f4eaa3 100644
--- a/etc/nls/posix/src/fi_FI
+++ b/etc/nls/posix/src/fi_FI
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Finnish language locale for Finland
 % sorting according to SFS 4600 (1986-06-09)
 % Source: RAP
diff --git a/etc/nls/posix/src/fo_FO b/etc/nls/posix/src/fo_FO
index e7edcf8..f4d02d8 100644
--- a/etc/nls/posix/src/fo_FO
+++ b/etc/nls/posix/src/fo_FO
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Faroese language locale for Faroe Islands
 % Source: Danish Standards Association
 % Address: Kollegievej 6
diff --git a/etc/nls/posix/src/fr_BE b/etc/nls/posix/src/fr_BE
index 9377d7b..1bcc921 100644
--- a/etc/nls/posix/src/fr_BE
+++ b/etc/nls/posix/src/fr_BE
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Belgium
 % Source: RAP
diff --git a/etc/nls/posix/src/fr_CA b/etc/nls/posix/src/fr_CA
index 3e7dd46..8325418 100644
--- a/etc/nls/posix/src/fr_CA
+++ b/etc/nls/posix/src/fr_CA
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Canada
 % Source: RAP
diff --git a/etc/nls/posix/src/fr_CH b/etc/nls/posix/src/fr_CH
index 5ff8784..fb4a559 100644
--- a/etc/nls/posix/src/fr_CH
+++ b/etc/nls/posix/src/fr_CH
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Switzerland
 % Source: RAP
diff --git a/etc/nls/posix/src/fr_EU b/etc/nls/posix/src/fr_EU
index 0d6f3dd..3288284 100644
--- a/etc/nls/posix/src/fr_EU
+++ b/etc/nls/posix/src/fr_EU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
diff --git a/etc/nls/posix/src/fr_FR b/etc/nls/posix/src/fr_FR
index 198f673..a189465 100644
--- a/etc/nls/posix/src/fr_FR
+++ b/etc/nls/posix/src/fr_FR
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for France
 % Source: RAP
diff --git a/etc/nls/posix/src/fr_LU b/etc/nls/posix/src/fr_LU
index eabef41..5d203e0 100644
--- a/etc/nls/posix/src/fr_LU
+++ b/etc/nls/posix/src/fr_LU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Luxemburg
 % Source: RAP
diff --git a/etc/nls/posix/src/ga_EU b/etc/nls/posix/src/ga_EU
index 2fc61cf..c39a4a8 100644
--- a/etc/nls/posix/src/ga_EU
+++ b/etc/nls/posix/src/ga_EU
@@ -1,5 +1,27 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Irish language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
 % Address: rue de Stassart, 36
diff --git a/etc/nls/posix/src/ga_IE b/etc/nls/posix/src/ga_IE
index 1e02786..f75b410 100644
--- a/etc/nls/posix/src/ga_IE
+++ b/etc/nls/posix/src/ga_IE
@@ -1,5 +1,27 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Irish language locale for Ireland
 % Source: NSAI
 % Address: Glasnevin, Dublin 9, Ireland
diff --git a/etc/nls/posix/src/gl_ES b/etc/nls/posix/src/gl_ES
index fa21a04..bf77660 100644
--- a/etc/nls/posix/src/gl_ES
+++ b/etc/nls/posix/src/gl_ES
@@ -1,6 +1,27 @@
 comment_char %
-escape_char  /
+escape_char /
 repertoiremap mnemonic.ds
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Galician Language Locale for Spain
 % Source: GPUL
diff --git a/etc/nls/posix/src/he_IL b/etc/nls/posix/src/he_IL
index 1aeec71..368a739 100644
--- a/etc/nls/posix/src/he_IL
+++ b/etc/nls/posix/src/he_IL
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Hebrew Language Locale for Israel
 % Source: RAP
diff --git a/etc/nls/posix/src/hr_HR b/etc/nls/posix/src/hr_HR
index 6cdc08d..a10457d 100644
--- a/etc/nls/posix/src/hr_HR
+++ b/etc/nls/posix/src/hr_HR
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Croatian Language Locale for Croatia
 % Source: USM/MZT
diff --git a/etc/nls/posix/src/hu_HU b/etc/nls/posix/src/hu_HU
index 049b2fa..f7189e6 100644
--- a/etc/nls/posix/src/hu_HU
+++ b/etc/nls/posix/src/hu_HU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Hungarian Language Locale for Hungary
 % Source: RAP
diff --git a/etc/nls/posix/src/id_ID b/etc/nls/posix/src/id_ID
index b892cfa..7b4ec00 100644
--- a/etc/nls/posix/src/id_ID
+++ b/etc/nls/posix/src/id_ID
@@ -1,7 +1,29 @@
-escape_char  /
-comment_char  %
+comment_char %
+escape_char /
 repertoiremap mnemonic.ds
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+%
 % Indonesian language locale for Indonesia
 % Source:
 % Address:
diff --git a/etc/nls/posix/src/is_EU b/etc/nls/posix/src/is_EU
index 1e8ce62..ef80bad 100644
--- a/etc/nls/posix/src/is_EU
+++ b/etc/nls/posix/src/is_EU
@@ -1,6 +1,27 @@
 comment_char %
-escape_char  /
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Icelandic language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
 % Address: rue de Stassart, 36
diff --git a/etc/nls/posix/src/is_IS b/etc/nls/posix/src/is_IS
index ac6912e..dce772f 100644
--- a/etc/nls/posix/src/is_IS
+++ b/etc/nls/posix/src/is_IS
@@ -1,6 +1,27 @@
 comment_char %
-escape_char  /
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Icelandic Language Locale for Iceland
 % Source: Stadlarad I'slands
 % Address: Keldnaholt-ITI'
diff --git a/etc/nls/posix/src/it_EU b/etc/nls/posix/src/it_EU
index ff31b9d..a957c0d 100644
--- a/etc/nls/posix/src/it_EU
+++ b/etc/nls/posix/src/it_EU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Italian language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
diff --git a/etc/nls/posix/src/it_IT b/etc/nls/posix/src/it_IT
index 4fbc3fc..63aaa28 100644
--- a/etc/nls/posix/src/it_IT
+++ b/etc/nls/posix/src/it_IT
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Italian Language Locale for Italy
 % Source: RAP
diff --git a/etc/nls/posix/src/iw_IL b/etc/nls/posix/src/iw_IL
index 1aeec71..368a739 100644
--- a/etc/nls/posix/src/iw_IL
+++ b/etc/nls/posix/src/iw_IL
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Hebrew Language Locale for Israel
 % Source: RAP
diff --git a/etc/nls/posix/src/kl_GL b/etc/nls/posix/src/kl_GL
index 5e6463c..3aa0988 100644
--- a/etc/nls/posix/src/kl_GL
+++ b/etc/nls/posix/src/kl_GL
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Greenlandic language locale for Greenland
 % Source: Danish Standards Association
 % Address: Kollegievej 6
diff --git a/etc/nls/posix/src/lt_LT b/etc/nls/posix/src/lt_LT
index 520385c..6826b08 100644
--- a/etc/nls/posix/src/lt_LT
+++ b/etc/nls/posix/src/lt_LT
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Lithuanian language locale for Lithuania
 % Created on January 30, 1992
 %  by Edmundas Miseikis, Algimantas
diff --git a/etc/nls/posix/src/lv_LV b/etc/nls/posix/src/lv_LV
index ca7e62d..84957ab 100644
--- a/etc/nls/posix/src/lv_LV
+++ b/etc/nls/posix/src/lv_LV
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Latvian language locale for Latvia
 % Source: Latvian Standard LVS 24-93
 % Address: LU MII, Rainis boul. 29
diff --git a/etc/nls/posix/src/nl_BE b/etc/nls/posix/src/nl_BE
index 4fb016d..69ada18 100644
--- a/etc/nls/posix/src/nl_BE
+++ b/etc/nls/posix/src/nl_BE
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Dutch Language Locale for Belgium
 % Source: RAP
diff --git a/etc/nls/posix/src/nl_EU b/etc/nls/posix/src/nl_EU
index 979a034..880ac02 100644
--- a/etc/nls/posix/src/nl_EU
+++ b/etc/nls/posix/src/nl_EU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Dutch language locale for the Europe
 % Source: CEN/ISSS Eurolocale workshop
diff --git a/etc/nls/posix/src/nl_NL b/etc/nls/posix/src/nl_NL
index 6fe349c..7d54f44 100644
--- a/etc/nls/posix/src/nl_NL
+++ b/etc/nls/posix/src/nl_NL
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Dutch Language Locale for the Netherlands
 % Source: RAP
diff --git a/etc/nls/posix/src/no_EU b/etc/nls/posix/src/no_EU
index 0d38d56..377e3db 100644
--- a/etc/nls/posix/src/no_EU
+++ b/etc/nls/posix/src/no_EU
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Norwegian language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
 % Address: rue de Stassart, 36
diff --git a/etc/nls/posix/src/no_NO b/etc/nls/posix/src/no_NO
index d7b1e74..ced290c 100644
--- a/etc/nls/posix/src/no_NO
+++ b/etc/nls/posix/src/no_NO
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Norwegian language locale for Norway
 % Source: Norsk Standardiseringsforbund
 % Address: University Library,
diff --git a/etc/nls/posix/src/pl_PL b/etc/nls/posix/src/pl_PL
index 0ad8f83..8e3bb60 100644
--- a/etc/nls/posix/src/pl_PL
+++ b/etc/nls/posix/src/pl_PL
@@ -1,5 +1,26 @@
 comment_char %
 escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Polish Language Locale for Poland
 % Source: RAP
diff --git a/etc/nls/posix/src/pt_BR b/etc/nls/posix/src/pt_BR
index fa54f1e..be3524b 100644
--- a/etc/nls/posix/src/pt_BR
+++ b/etc/nls/posix/src/pt_BR
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Portuguese Language Locale for Brasil
 % Source: RAP
diff --git a/etc/nls/posix/src/pt_EU b/etc/nls/posix/src/pt_EU
index 13ac9e3..9242925 100644
--- a/etc/nls/posix/src/pt_EU
+++ b/etc/nls/posix/src/pt_EU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Portuguese language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
diff --git a/etc/nls/posix/src/pt_PT b/etc/nls/posix/src/pt_PT
index ab5e4ea..e367924 100644
--- a/etc/nls/posix/src/pt_PT
+++ b/etc/nls/posix/src/pt_PT
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Portuguese Language Locale for Portugal
 % Source: RAP
diff --git a/etc/nls/posix/src/ro_RO b/etc/nls/posix/src/ro_RO
index 80a2b38..b43bf17 100644
--- a/etc/nls/posix/src/ro_RO
+++ b/etc/nls/posix/src/ro_RO
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Romanian Language Locale for Romania
 % Source: RAP
diff --git a/etc/nls/posix/src/ru_RU b/etc/nls/posix/src/ru_RU
index e060f17..2476e66 100644
--- a/etc/nls/posix/src/ru_RU
+++ b/etc/nls/posix/src/ru_RU
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Russian Language Locale for Russia
 % Source: RAP
diff --git a/etc/nls/posix/src/sl_SI b/etc/nls/posix/src/sl_SI
index 9ae0023..4b93f0a 100644
--- a/etc/nls/posix/src/sl_SI
+++ b/etc/nls/posix/src/sl_SI
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Slovenian language locale for Slovenia
 % Source: USM/MZT
diff --git a/etc/nls/posix/src/sv_EU b/etc/nls/posix/src/sv_EU
index dc60380..04097f3 100644
--- a/etc/nls/posix/src/sv_EU
+++ b/etc/nls/posix/src/sv_EU
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Swedish language locale for Europe
 % Source: CEN/ISSS Eurolocale workshop
 % Address: rue de Stassart, 36
diff --git a/etc/nls/posix/src/sv_FI b/etc/nls/posix/src/sv_FI
index fceca6e..c48e3c7 100644
--- a/etc/nls/posix/src/sv_FI
+++ b/etc/nls/posix/src/sv_FI
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Swedish Language Locale for Finland
 % Source: RAP
diff --git a/etc/nls/posix/src/sv_SE b/etc/nls/posix/src/sv_SE
index f17893e..bf8b141 100644
--- a/etc/nls/posix/src/sv_SE
+++ b/etc/nls/posix/src/sv_SE
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Swedish language locale for Sweden
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/posix/src/tr_TR b/etc/nls/posix/src/tr_TR
index db94a83..6306a7c 100644
--- a/etc/nls/posix/src/tr_TR
+++ b/etc/nls/posix/src/tr_TR
@@ -1,5 +1,26 @@
 comment_char %
-escape_char  /
+escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Turkish Language Locale for Turkey
 % Source: RAP
diff --git a/etc/nls/src/POSIX b/etc/nls/src/POSIX
index 00c5b4a..131bd7e 100644
--- a/etc/nls/src/POSIX
+++ b/etc/nls/src/POSIX
@@ -1,3 +1,25 @@
+#########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  License); you may  not use  this file  
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+#########################################################################
+#
 # POSIX Standard Locale
 #
 # As per ISO/IEC 9945-2:1993 specifications
diff --git a/etc/nls/src/af_ZA b/etc/nls/src/af_ZA
index 2e8f979..252c3a6 100644
--- a/etc/nls/src/af_ZA
+++ b/etc/nls/src/af_ZA
@@ -1,5 +1,26 @@
+comment_char %
 escape_char  /
-comment_char  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Afrikaans language locale for South Africa
 % Source: RAP
diff --git a/etc/nls/src/am_ET b/etc/nls/src/am_ET
index d785125..49f0212 100644
--- a/etc/nls/src/am_ET
+++ b/etc/nls/src/am_ET
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Amharic language locale for Ethiopia.
 % Contributed by Daniel Yacob <yacob@geez.org>
 % Charset: UTF-8
diff --git a/etc/nls/src/ar_AE b/etc/nls/src/ar_AE
index 6530740..ca553ef 100644
--- a/etc/nls/src/ar_AE
+++ b/etc/nls/src/ar_AE
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for United Arab Emirates.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_BH b/etc/nls/src/ar_BH
index 66db36d..7e778b9 100644
--- a/etc/nls/src/ar_BH
+++ b/etc/nls/src/ar_BH
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Bahrain.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_DZ b/etc/nls/src/ar_DZ
index 4096112..1808302 100644
--- a/etc/nls/src/ar_DZ
+++ b/etc/nls/src/ar_DZ
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Algeria.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_EG b/etc/nls/src/ar_EG
index 852af9d..68bdf34 100644
--- a/etc/nls/src/ar_EG
+++ b/etc/nls/src/ar_EG
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Egypt.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_IN b/etc/nls/src/ar_IN
index 47d9ec1..c2c7246 100644
--- a/etc/nls/src/ar_IN
+++ b/etc/nls/src/ar_IN
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Contributed by Kentaro Noji   (knoji@jp.ibm.com)
 % Tetsuji Oriata (Oriata@jp.ibm.com) and Others, 2000
 
@@ -212,3 +234,4 @@
 END LC_MEASUREMENT
 
 
+
diff --git a/etc/nls/src/ar_IQ b/etc/nls/src/ar_IQ
index 6b1cf15..3f6d26c 100644
--- a/etc/nls/src/ar_IQ
+++ b/etc/nls/src/ar_IQ
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Iraq.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_JO b/etc/nls/src/ar_JO
index e8fcf24..1bbeac9 100644
--- a/etc/nls/src/ar_JO
+++ b/etc/nls/src/ar_JO
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Jordan.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_KW b/etc/nls/src/ar_KW
index cc28a08..32b31e8 100644
--- a/etc/nls/src/ar_KW
+++ b/etc/nls/src/ar_KW
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Kuwait.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_LB b/etc/nls/src/ar_LB
index 69f2f9d..6cadeb6 100644
--- a/etc/nls/src/ar_LB
+++ b/etc/nls/src/ar_LB
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Lebanon.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_LY b/etc/nls/src/ar_LY
index 3c7dc0f..ae14f7b 100644
--- a/etc/nls/src/ar_LY
+++ b/etc/nls/src/ar_LY
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Libyan Arab Jamahiriya.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_MA b/etc/nls/src/ar_MA
index 93da0fd..d722ee0 100644
--- a/etc/nls/src/ar_MA
+++ b/etc/nls/src/ar_MA
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Morocco.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_OM b/etc/nls/src/ar_OM
index ee42dde..2dbee06 100644
--- a/etc/nls/src/ar_OM
+++ b/etc/nls/src/ar_OM
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Oman.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_QA b/etc/nls/src/ar_QA
index 9795dda..4a2f09b 100644
--- a/etc/nls/src/ar_QA
+++ b/etc/nls/src/ar_QA
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Qatar.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_SA b/etc/nls/src/ar_SA
index 37f0f3c..8ed21ac 100644
--- a/etc/nls/src/ar_SA
+++ b/etc/nls/src/ar_SA
@@ -1,6 +1,27 @@
 comment_char %
 escape_char  /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic Locale
 % Charset: ISO-8859-6
 % By: Salvador Sabanal, LinuxLab, SAP AG <salvador.sabanal@sap.com>
diff --git a/etc/nls/src/ar_SD b/etc/nls/src/ar_SD
index beab55a..3167d1a 100644
--- a/etc/nls/src/ar_SD
+++ b/etc/nls/src/ar_SD
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Sudan.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_SY b/etc/nls/src/ar_SY
index 6e39f0b..5792de3 100644
--- a/etc/nls/src/ar_SY
+++ b/etc/nls/src/ar_SY
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Syrian Arab Republic.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_TN b/etc/nls/src/ar_TN
index d6bad1c..0d09c95 100644
--- a/etc/nls/src/ar_TN
+++ b/etc/nls/src/ar_TN
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Tunisia.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ar_YE b/etc/nls/src/ar_YE
index c9c845f..91b27a3 100644
--- a/etc/nls/src/ar_YE
+++ b/etc/nls/src/ar_YE
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Arabic language locale for Yemen.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/az_AZ b/etc/nls/src/az_AZ
index e54a259..abd9ad1 100644
--- a/etc/nls/src/az_AZ
+++ b/etc/nls/src/az_AZ
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Azeri Language Locale for Azerbaijan (latin)
 % Source:
diff --git a/etc/nls/src/be_BY b/etc/nls/src/be_BY
index 5c9104d..f9b8bc3 100644
--- a/etc/nls/src/be_BY
+++ b/etc/nls/src/be_BY
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Belarusian Language Locale for Belarus
 % Contact: Aleksey Novodvorsky
diff --git a/etc/nls/src/bg_BG b/etc/nls/src/bg_BG
index 31cd3e5..00480ea 100644
--- a/etc/nls/src/bg_BG
+++ b/etc/nls/src/bg_BG
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % Distribution and use is free, also
 % for commercial purposes.
diff --git a/etc/nls/src/bn_IN b/etc/nls/src/bn_IN
index 4a3f7bc..b75c05c 100644
--- a/etc/nls/src/bn_IN
+++ b/etc/nls/src/bn_IN
@@ -1,6 +1,27 @@
 comment_char    %
 escape_char     /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 LC_IDENTIFICATION
 % This is the ISO_IEC TR14652 Locale definition for the LC_IDENTIFICATION
 % category generated by IBM Basic CountryPack Transformer.
@@ -226,3 +247,4 @@
 END LC_MEASUREMENT
 
 
+
diff --git a/etc/nls/src/br_FR b/etc/nls/src/br_FR
index e79f994..8f0912c 100644
--- a/etc/nls/src/br_FR
+++ b/etc/nls/src/br_FR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Breton Language Locale for France
 % Source: thanks to Denise.Peden@enst-bretagne.fr (Denise Derrien-Peden)
diff --git a/etc/nls/src/bs_BA b/etc/nls/src/bs_BA
index f73055e..f03e600 100644
--- a/etc/nls/src/bs_BA
+++ b/etc/nls/src/bs_BA
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Bosnian Language Locale for Bosnia
 % Source: adapted from Croatian locale
diff --git a/etc/nls/src/ca_ES b/etc/nls/src/ca_ES
index 3a25830..073440c 100644
--- a/etc/nls/src/ca_ES
+++ b/etc/nls/src/ca_ES
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Catalan Language Locale for Spain
 % Source: RAP
diff --git a/etc/nls/src/ca_ES.euro b/etc/nls/src/ca_ES.euro
index f1f1da9..0bd4176 100644
--- a/etc/nls/src/ca_ES.euro
+++ b/etc/nls/src/ca_ES.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Catalan Language Locale for Spain with Euro
 % Language: ca
diff --git a/etc/nls/src/cs_CZ b/etc/nls/src/cs_CZ
index df3ea6c..121a0fd 100644
--- a/etc/nls/src/cs_CZ
+++ b/etc/nls/src/cs_CZ
@@ -1,5 +1,26 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Czech Language Locale for Czech
 % Source:
diff --git a/etc/nls/src/cy_GB b/etc/nls/src/cy_GB
index bdc27cc..9ae07ef 100644
--- a/etc/nls/src/cy_GB
+++ b/etc/nls/src/cy_GB
@@ -1,5 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % charset "ISO-8859-14"
 % Distribution and use is free, also  for commercial purposes.
 
diff --git a/etc/nls/src/da_DK b/etc/nls/src/da_DK
index 63df760..145cebe 100644
--- a/etc/nls/src/da_DK
+++ b/etc/nls/src/da_DK
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Danish language locale for Denmark
 % Source: Danish Standards Association
 % Address: Kollegievej 6
diff --git a/etc/nls/src/de_AT b/etc/nls/src/de_AT
index 7b2c3d9..78dac02 100644
--- a/etc/nls/src/de_AT
+++ b/etc/nls/src/de_AT
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 % German Language Locale for Austria
 % Source: O:sterreiches Normungsinstitut
diff --git a/etc/nls/src/de_AT.euro b/etc/nls/src/de_AT.euro
index 58ae9fa..1d4430a 100644
--- a/etc/nls/src/de_AT.euro
+++ b/etc/nls/src/de_AT.euro
@@ -1,6 +1,27 @@
 comment_char %
 escape_char  /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % German Language Locale for Austria with Euro
 % Source: O:sterreiches Normungsinstitut
 % Address: Postfach 130, A-1021 Wien
diff --git a/etc/nls/src/de_BE b/etc/nls/src/de_BE
index 1258039..cc61fcd 100644
--- a/etc/nls/src/de_BE
+++ b/etc/nls/src/de_BE
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Belgium
 % Source: RAP
diff --git a/etc/nls/src/de_BE.euro b/etc/nls/src/de_BE.euro
index 4efef0b..fc0dd6c 100644
--- a/etc/nls/src/de_BE.euro
+++ b/etc/nls/src/de_BE.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Belgium with Euro
 % Language: de
diff --git a/etc/nls/src/de_CH b/etc/nls/src/de_CH
index 7ddb580..bfe6786 100644
--- a/etc/nls/src/de_CH
+++ b/etc/nls/src/de_CH
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Switzerland
 % Source: RAP
diff --git a/etc/nls/src/de_DE b/etc/nls/src/de_DE
index 05111ab..c524039 100644
--- a/etc/nls/src/de_DE
+++ b/etc/nls/src/de_DE
@@ -1,5 +1,27 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Locale for German locale in Germany
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
 
diff --git a/etc/nls/src/de_DE.euro b/etc/nls/src/de_DE.euro
index 5d80fa3..14e0928 100644
--- a/etc/nls/src/de_DE.euro
+++ b/etc/nls/src/de_DE.euro
@@ -1,5 +1,27 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Locale for German locale in Germany
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
 
diff --git a/etc/nls/src/de_LU b/etc/nls/src/de_LU
index 5f3cafb..394055f 100644
--- a/etc/nls/src/de_LU
+++ b/etc/nls/src/de_LU
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Luxemburg
 % Source: RAP
diff --git a/etc/nls/src/de_LU.euro b/etc/nls/src/de_LU.euro
index 84a301f..2d492ed 100644
--- a/etc/nls/src/de_LU.euro
+++ b/etc/nls/src/de_LU.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % German Language Locale for Luxemburg with Euro
 % Language: de
diff --git a/etc/nls/src/el_GR b/etc/nls/src/el_GR
index f8078b3..478218e 100644
--- a/etc/nls/src/el_GR
+++ b/etc/nls/src/el_GR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Greek Language Locale for Greece
 % Source: RAP
diff --git a/etc/nls/src/el_GR.euro b/etc/nls/src/el_GR.euro
index 2ed1c95..053f634 100644
--- a/etc/nls/src/el_GR.euro
+++ b/etc/nls/src/el_GR.euro
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 LC_IDENTIFICATION
 title      "Greek locale for Greece with Euro"
 source     "Free Software Foundation, Inc."
diff --git a/etc/nls/src/en_AU b/etc/nls/src/en_AU
index 3385fb0..29f2495 100644
--- a/etc/nls/src/en_AU
+++ b/etc/nls/src/en_AU
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Australia
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/src/en_BW b/etc/nls/src/en_BW
index 2ef9248..0d06d33 100644
--- a/etc/nls/src/en_BW
+++ b/etc/nls/src/en_BW
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Botswana
 % Source: RAP
 % Email: Schalk W. Cronje <schalkc@ntaba.co.za>
diff --git a/etc/nls/src/en_CA b/etc/nls/src/en_CA
index 569978c..c668b61 100644
--- a/etc/nls/src/en_CA
+++ b/etc/nls/src/en_CA
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Canada
 % sorting according to CAN/CSA-Z243.4.1-1992
 % Source: RAP
diff --git a/etc/nls/src/en_DK b/etc/nls/src/en_DK
index 0efe331..2688fbb 100644
--- a/etc/nls/src/en_DK
+++ b/etc/nls/src/en_DK
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Denmark
 %
 % Written according to POSIX.2
diff --git a/etc/nls/src/en_GB b/etc/nls/src/en_GB
index 1ade8ce..97f4478 100644
--- a/etc/nls/src/en_GB
+++ b/etc/nls/src/en_GB
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Britain
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/src/en_HK b/etc/nls/src/en_HK
index 8034398..09f95e3 100644
--- a/etc/nls/src/en_HK
+++ b/etc/nls/src/en_HK
@@ -1,6 +1,27 @@
 comment_char    %
 escape_char     /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English locale for Hong Kong
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/en_IE b/etc/nls/src/en_IE
index 94ac73f..360f159 100644
--- a/etc/nls/src/en_IE
+++ b/etc/nls/src/en_IE
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Ireland
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/src/en_IE.euro b/etc/nls/src/en_IE.euro
index aad2f8e..b425f9a 100644
--- a/etc/nls/src/en_IE.euro
+++ b/etc/nls/src/en_IE.euro
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Ireland with Euro
 % Language: en
 % Territory: IE
diff --git a/etc/nls/src/en_IN b/etc/nls/src/en_IN
index 6508287..1cad931 100644
--- a/etc/nls/src/en_IN
+++ b/etc/nls/src/en_IN
@@ -1,6 +1,27 @@
 comment_char    %
 escape_char     /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/en_NZ b/etc/nls/src/en_NZ
index f836bc3..e0697ff 100644
--- a/etc/nls/src/en_NZ
+++ b/etc/nls/src/en_NZ
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for New Zealand
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/src/en_PH b/etc/nls/src/en_PH
index 1ed5064..ada1d24 100644
--- a/etc/nls/src/en_PH
+++ b/etc/nls/src/en_PH
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Philippines.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
@@ -213,3 +235,4 @@
 END LC_MEASUREMENT
 
 
+
diff --git a/etc/nls/src/en_SG b/etc/nls/src/en_SG
index 38719c6..ab9755f 100644
--- a/etc/nls/src/en_SG
+++ b/etc/nls/src/en_SG
@@ -1,6 +1,27 @@
 comment_char    %
 escape_char     /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Singapore.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/en_US b/etc/nls/src/en_US
index 13a19db..f4f3e30 100644
--- a/etc/nls/src/en_US
+++ b/etc/nls/src/en_US
@@ -1,5 +1,27 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Locale for English locale in the USA
 % Contributed by Ulrich Drepper <drepper@redhat.com>, 2000
 
diff --git a/etc/nls/src/en_ZA b/etc/nls/src/en_ZA
index abcd738..1f32a29 100644
--- a/etc/nls/src/en_ZA
+++ b/etc/nls/src/en_ZA
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for South Africa
 % Source: RAP
 % Email: nic@sig.co.za
diff --git a/etc/nls/src/en_ZW b/etc/nls/src/en_ZW
index 2466d7b..7ddc5a6 100644
--- a/etc/nls/src/en_ZW
+++ b/etc/nls/src/en_ZW
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % English language locale for Zimbabwe
 % Source: RAP
 % Email: Schalk W. Cronje <schalkc@ntaba.co.za>
diff --git a/etc/nls/src/es_AR b/etc/nls/src/es_AR
index 92f9d2d..9dfa404 100644
--- a/etc/nls/src/es_AR
+++ b/etc/nls/src/es_AR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Argentina
 % Source: RAP
diff --git a/etc/nls/src/es_BO b/etc/nls/src/es_BO
index 92dc84c..fa8efcb 100644
--- a/etc/nls/src/es_BO
+++ b/etc/nls/src/es_BO
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Bolivia
 % Source: RAP
diff --git a/etc/nls/src/es_CL b/etc/nls/src/es_CL
index 10873c4..6175c93 100644
--- a/etc/nls/src/es_CL
+++ b/etc/nls/src/es_CL
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Chile
 % Source: RAP
diff --git a/etc/nls/src/es_CO b/etc/nls/src/es_CO
index b6c5248..5ecfb3e 100644
--- a/etc/nls/src/es_CO
+++ b/etc/nls/src/es_CO
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Colombia
 % Source: RAP
diff --git a/etc/nls/src/es_CR b/etc/nls/src/es_CR
index 9809b38..4c56749 100644
--- a/etc/nls/src/es_CR
+++ b/etc/nls/src/es_CR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Costa Rica
 % Language: es
diff --git a/etc/nls/src/es_DO b/etc/nls/src/es_DO
index d73184a..45d02eb 100644
--- a/etc/nls/src/es_DO
+++ b/etc/nls/src/es_DO
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Dominican Republic
 % Source: RAP
diff --git a/etc/nls/src/es_EC b/etc/nls/src/es_EC
index 8c9cb53..1473c9c 100644
--- a/etc/nls/src/es_EC
+++ b/etc/nls/src/es_EC
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish Language Locale for Equador
 % Source: RAP
diff --git a/etc/nls/src/es_ES b/etc/nls/src/es_ES
index 366c0a4..3e36a83 100644
--- a/etc/nls/src/es_ES
+++ b/etc/nls/src/es_ES
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish Language Locale for Spain
 % Source: RAP
diff --git a/etc/nls/src/es_ES.euro b/etc/nls/src/es_ES.euro
index aff58e9..59c2960 100644
--- a/etc/nls/src/es_ES.euro
+++ b/etc/nls/src/es_ES.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish Language Locale for Spain with Euro
 % Language: es
diff --git a/etc/nls/src/es_GT b/etc/nls/src/es_GT
index 1d4c799..0200197 100644
--- a/etc/nls/src/es_GT
+++ b/etc/nls/src/es_GT
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Guatemala
 % Source: RAP
diff --git a/etc/nls/src/es_HN b/etc/nls/src/es_HN
index 6e8cf8e..9f223f4 100644
--- a/etc/nls/src/es_HN
+++ b/etc/nls/src/es_HN
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Honduras
 % Source: RAP
diff --git a/etc/nls/src/es_MX b/etc/nls/src/es_MX
index d1064ce..760117d 100644
--- a/etc/nls/src/es_MX
+++ b/etc/nls/src/es_MX
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Mexico
 % Source: RAP
diff --git a/etc/nls/src/es_NI b/etc/nls/src/es_NI
index 11ca382..f95143d 100644
--- a/etc/nls/src/es_NI
+++ b/etc/nls/src/es_NI
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Nicaragua
 % Language: es
diff --git a/etc/nls/src/es_PA b/etc/nls/src/es_PA
index 40de3d3..68cf055 100644
--- a/etc/nls/src/es_PA
+++ b/etc/nls/src/es_PA
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Panama
 % Source: RAP
diff --git a/etc/nls/src/es_PE b/etc/nls/src/es_PE
index fabf9f3..fcf27da 100644
--- a/etc/nls/src/es_PE
+++ b/etc/nls/src/es_PE
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Peru
 % Source: RAP
diff --git a/etc/nls/src/es_PR b/etc/nls/src/es_PR
index 552950a..654a826 100644
--- a/etc/nls/src/es_PR
+++ b/etc/nls/src/es_PR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Puerto Rico
 % Language: es
diff --git a/etc/nls/src/es_PY b/etc/nls/src/es_PY
index f8929b9..73a36af 100644
--- a/etc/nls/src/es_PY
+++ b/etc/nls/src/es_PY
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Paraguay
 % Source: RAP
diff --git a/etc/nls/src/es_SV b/etc/nls/src/es_SV
index 47edbdc..65490d3 100644
--- a/etc/nls/src/es_SV
+++ b/etc/nls/src/es_SV
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for El Salvador
 % Source: RAP
diff --git a/etc/nls/src/es_US b/etc/nls/src/es_US
index a6f843c..bef815f 100644
--- a/etc/nls/src/es_US
+++ b/etc/nls/src/es_US
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish Language Locale for U.S.A.
 % Source: RAP
diff --git a/etc/nls/src/es_UY b/etc/nls/src/es_UY
index fe2bc68..1f45095 100644
--- a/etc/nls/src/es_UY
+++ b/etc/nls/src/es_UY
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Uruguay
 % Source: RAP
diff --git a/etc/nls/src/es_VE b/etc/nls/src/es_VE
index f9156a3..cef8917 100644
--- a/etc/nls/src/es_VE
+++ b/etc/nls/src/es_VE
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Spanish language locale for Venezuela
 % Source: RAP
diff --git a/etc/nls/src/et_EE b/etc/nls/src/et_EE
index 39c1288..e133b34 100644
--- a/etc/nls/src/et_EE
+++ b/etc/nls/src/et_EE
@@ -1,6 +1,27 @@
-escape_char  /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Estonian language locale for Estonia
 % according to EVS 8:1993
 % Source: Estonian Informatics Fund
diff --git a/etc/nls/src/eu_ES b/etc/nls/src/eu_ES
index a92d97d..789b9d5 100644
--- a/etc/nls/src/eu_ES
+++ b/etc/nls/src/eu_ES
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Basque Language Locale for Spain
 % Source: RAP
diff --git a/etc/nls/src/eu_ES.euro b/etc/nls/src/eu_ES.euro
index c536133..48edb67 100644
--- a/etc/nls/src/eu_ES.euro
+++ b/etc/nls/src/eu_ES.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Basque Language Locale for Spain with Euro
 % Language: eu
diff --git a/etc/nls/src/fa_IR b/etc/nls/src/fa_IR
index b027a0a..f88672d 100644
--- a/etc/nls/src/fa_IR
+++ b/etc/nls/src/fa_IR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Persian Language Locale for Iran with UTF-8 character set
 % Source: The FarsiWeb Project
diff --git a/etc/nls/src/fi_FI b/etc/nls/src/fi_FI
index 150ad56..391d243 100644
--- a/etc/nls/src/fi_FI
+++ b/etc/nls/src/fi_FI
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Finnish language locale for Finland
 % sorting according to SFS 4600 (1986-06-09)
 % Source: RAP
diff --git a/etc/nls/src/fi_FI.euro b/etc/nls/src/fi_FI.euro
index 24b55e9..dc6f587 100644
--- a/etc/nls/src/fi_FI.euro
+++ b/etc/nls/src/fi_FI.euro
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Finnish language locale for Finland with Euro
 % Language: fi
 % Territory: FI
diff --git a/etc/nls/src/fo_FO b/etc/nls/src/fo_FO
index c320814..896c94e 100644
--- a/etc/nls/src/fo_FO
+++ b/etc/nls/src/fo_FO
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Faroese language locale for Faroe Islands
 % Source: Danish Standards Association
 % Address: Kollegievej 6
diff --git a/etc/nls/src/fr_BE b/etc/nls/src/fr_BE
index e3b05d9..ae48069 100644
--- a/etc/nls/src/fr_BE
+++ b/etc/nls/src/fr_BE
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Belgium
 % Source: RAP
diff --git a/etc/nls/src/fr_BE.euro b/etc/nls/src/fr_BE.euro
index 74ce5ed..a623bce 100644
--- a/etc/nls/src/fr_BE.euro
+++ b/etc/nls/src/fr_BE.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Belgium with Euro
 % Language: fr
diff --git a/etc/nls/src/fr_CA b/etc/nls/src/fr_CA
index c02aa15..1baa399 100644
--- a/etc/nls/src/fr_CA
+++ b/etc/nls/src/fr_CA
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Canada
 % Source: RAP
diff --git a/etc/nls/src/fr_CH b/etc/nls/src/fr_CH
index 9772dd8..f7a2f30 100644
--- a/etc/nls/src/fr_CH
+++ b/etc/nls/src/fr_CH
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Switzerland
 % Source: RAP
diff --git a/etc/nls/src/fr_FR b/etc/nls/src/fr_FR
index 1caa5c4..31e9704 100644
--- a/etc/nls/src/fr_FR
+++ b/etc/nls/src/fr_FR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for France
 % Source: RAP
diff --git a/etc/nls/src/fr_FR.euro b/etc/nls/src/fr_FR.euro
index a8b5af5..86129a0 100644
--- a/etc/nls/src/fr_FR.euro
+++ b/etc/nls/src/fr_FR.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for France with Euro
 % Language: fr
diff --git a/etc/nls/src/fr_LU b/etc/nls/src/fr_LU
index cb6cf3a..0137a4e 100644
--- a/etc/nls/src/fr_LU
+++ b/etc/nls/src/fr_LU
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Luxemburg
 % Source: RAP
diff --git a/etc/nls/src/fr_LU.euro b/etc/nls/src/fr_LU.euro
index a2beda9..fb8e9ce 100644
--- a/etc/nls/src/fr_LU.euro
+++ b/etc/nls/src/fr_LU.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % French Language Locale for Luxemburg with Euro
 % Language: fr
diff --git a/etc/nls/src/ga_IE b/etc/nls/src/ga_IE
index bfb5be2..5ac4711 100644
--- a/etc/nls/src/ga_IE
+++ b/etc/nls/src/ga_IE
@@ -1,5 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Irish language locale for Ireland
 % Source: NSAI
 % Address: Glasnevin, Dublin 9, Ireland
diff --git a/etc/nls/src/ga_IE.euro b/etc/nls/src/ga_IE.euro
index d6cfdbc..eecf136 100644
--- a/etc/nls/src/ga_IE.euro
+++ b/etc/nls/src/ga_IE.euro
@@ -1,5 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Irish language locale for Ireland with Euro
 % Language: ga
 % Territory: IE
diff --git a/etc/nls/src/gd_GB b/etc/nls/src/gd_GB
index 1035dd1..12cfa0f 100644
--- a/etc/nls/src/gd_GB
+++ b/etc/nls/src/gd_GB
@@ -1,5 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % charset "ISO_8859-15"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/etc/nls/src/gl_ES b/etc/nls/src/gl_ES
index 505ba78..251f77a 100644
--- a/etc/nls/src/gl_ES
+++ b/etc/nls/src/gl_ES
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Galician Language Locale for Spain
 % Source: GPUL
diff --git a/etc/nls/src/gl_ES.euro b/etc/nls/src/gl_ES.euro
index bd5660c..5a5ec65 100644
--- a/etc/nls/src/gl_ES.euro
+++ b/etc/nls/src/gl_ES.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Galician Language Locale for Spain with Euro
 % Language: gl
diff --git a/etc/nls/src/gv_GB b/etc/nls/src/gv_GB
index 1c108b1..35a179d 100644
--- a/etc/nls/src/gv_GB
+++ b/etc/nls/src/gv_GB
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % WARNING: UNOFFICIAL; EXPERIMENTAL. CHECK WITH Keld Simonsen 
 % to see if there is an offical release for Manx Gaelic.
 
diff --git a/etc/nls/src/he_IL b/etc/nls/src/he_IL
index 4ead30b..99a1308 100644
--- a/etc/nls/src/he_IL
+++ b/etc/nls/src/he_IL
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Hebrew Language Locale for Israel
 % Source: RAP
diff --git a/etc/nls/src/hi_IN b/etc/nls/src/hi_IN
index ad4b7df..eeef1d5 100644
--- a/etc/nls/src/hi_IN
+++ b/etc/nls/src/hi_IN
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Hindi language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/hr_HR b/etc/nls/src/hr_HR
index 3ce8fef..7cf057c 100644
--- a/etc/nls/src/hr_HR
+++ b/etc/nls/src/hr_HR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Croatian Language Locale for Croatia
 % Source: CARNet/MZT
diff --git a/etc/nls/src/hu_HU b/etc/nls/src/hu_HU
index 63d3bcf..609aff0 100644
--- a/etc/nls/src/hu_HU
+++ b/etc/nls/src/hu_HU
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Hungarian Language Locale for Hungary
 % Source: RAP
diff --git a/etc/nls/src/hy_AM b/etc/nls/src/hy_AM
index 04edbdb..a0ed525 100644
--- a/etc/nls/src/hy_AM
+++ b/etc/nls/src/hy_AM
@@ -1,5 +1,27 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % charset "ARMSCII-8"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/etc/nls/src/i18n b/etc/nls/src/i18n
index 39d5033..0b8a09f 100644
--- a/etc/nls/src/i18n
+++ b/etc/nls/src/i18n
@@ -1,5 +1,27 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 
 LC_IDENTIFICATION
 % This is the ISO/IEC TR 14652 "i18n" definition for
diff --git a/etc/nls/src/id_ID b/etc/nls/src/id_ID
index 87ce90e..4d9cce2 100644
--- a/etc/nls/src/id_ID
+++ b/etc/nls/src/id_ID
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Indonesian language locale for Indonesia
 % Source:
 % Address:
diff --git a/etc/nls/src/is_IS b/etc/nls/src/is_IS
index a62aa35..2610e68 100644
--- a/etc/nls/src/is_IS
+++ b/etc/nls/src/is_IS
@@ -1,6 +1,27 @@
 comment_char %
 escape_char  /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Icelandic Language Locale for Iceland
 % Source: Stadlarad I'slands
 % Address: Keldnaholt-ITI'
diff --git a/etc/nls/src/iso14651_t1 b/etc/nls/src/iso14651_t1
index 23eeb62..af306b8 100644
--- a/etc/nls/src/iso14651_t1
+++ b/etc/nls/src/iso14651_t1
@@ -1,3 +1,28 @@
+comment_char #
+escape_char  /
+#########################################################################
+#
+# Licensed to the Apache Software  Foundation (ASF) under one or more
+# contributor  license agreements.  See  the NOTICE  file distributed
+# with  this  work  for  additional information  regarding  copyright
+# ownership.   The ASF  licenses this  file to  you under  the Apache
+# License, Version  2.0 (the  License); you may  not use  this file  
+# except in  compliance with the License.   You may obtain  a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the  License is distributed on an  "AS IS" BASIS,
+# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+# implied.   See  the License  for  the  specific language  governing
+# permissions and limitations under the License.
+#
+# Copyright 1999-2007 Rogue Wave Software, Inc.
+#
+#########################################################################
+#
+
 LC_COLLATE
 
 # Déclaration des systèmes d'écriture / Declaration of scripts
diff --git a/etc/nls/src/it_CH b/etc/nls/src/it_CH
index b063892..6b6c2ca 100644
--- a/etc/nls/src/it_CH
+++ b/etc/nls/src/it_CH
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Italian Language Locale for Switzerland
 % Language: it
diff --git a/etc/nls/src/it_IT b/etc/nls/src/it_IT
index 7f035be..482233a 100644
--- a/etc/nls/src/it_IT
+++ b/etc/nls/src/it_IT
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Italian Language Locale for Italy
 % Source: RAP
diff --git a/etc/nls/src/it_IT.euro b/etc/nls/src/it_IT.euro
index 49ae075..f6fcf43 100644
--- a/etc/nls/src/it_IT.euro
+++ b/etc/nls/src/it_IT.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Italian Language Locale for Italy with Euro
 % Language: it
diff --git a/etc/nls/src/iw_IL b/etc/nls/src/iw_IL
index 683c696..52acebe 100644
--- a/etc/nls/src/iw_IL
+++ b/etc/nls/src/iw_IL
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Hebrew Language Locale for Israel
 % Source: RAP
diff --git a/etc/nls/src/ja_JP b/etc/nls/src/ja_JP
index a96849a..f5d71ab 100644
--- a/etc/nls/src/ja_JP
+++ b/etc/nls/src/ja_JP
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Name:    localedef for ja_JP
 % Version: 0.7
 % Date:    1999-12-05
diff --git a/etc/nls/src/ka_GE b/etc/nls/src/ka_GE
index 7f49e02..bb68431 100644
--- a/etc/nls/src/ka_GE
+++ b/etc/nls/src/ka_GE
@@ -1,5 +1,27 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % charset "GEORGIAN-PS"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/etc/nls/src/kl_GL b/etc/nls/src/kl_GL
index 0b4711f..d2e49d1 100644
--- a/etc/nls/src/kl_GL
+++ b/etc/nls/src/kl_GL
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Greenlandic language locale for Greenland
 % Source: Danish Standards Association
 % Address: Kollegievej 6
diff --git a/etc/nls/src/ko_KR b/etc/nls/src/ko_KR
index b4927fe..6c8287f 100644
--- a/etc/nls/src/ko_KR
+++ b/etc/nls/src/ko_KR
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Korean language locale for Republic of Korea (South Korea)
 % Source:
 % Address:
diff --git a/etc/nls/src/kw_GB b/etc/nls/src/kw_GB
index e51379a..f9e2393 100644
--- a/etc/nls/src/kw_GB
+++ b/etc/nls/src/kw_GB
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Cornish language locale for Britain
 % WARNING: UNOFFICIAL; EXPERIMENTAL. CHECK WITH Keld Simonsen 
 % to see if there is an offical release.
diff --git a/etc/nls/src/lt_LT b/etc/nls/src/lt_LT
index fc2d6fb..c5e779b 100644
--- a/etc/nls/src/lt_LT
+++ b/etc/nls/src/lt_LT
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Lithuanian language locale for Lithuania
 % Created on January 30, 1992
 %  by Edmundas Miseikis, Algimantas
diff --git a/etc/nls/src/lv_LV b/etc/nls/src/lv_LV
index 3c6cef0..a338660 100644
--- a/etc/nls/src/lv_LV
+++ b/etc/nls/src/lv_LV
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Latvian language locale for Latvia
 % Source: Latvian Standard LVS 24-93
 % Address: LU MII, Rainis boul. 29
diff --git a/etc/nls/src/mi_NZ b/etc/nls/src/mi_NZ
index caea664..412cc68 100644
--- a/etc/nls/src/mi_NZ
+++ b/etc/nls/src/mi_NZ
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Maori language locale for New Zealand
 % Source: James Gasson
diff --git a/etc/nls/src/mk_MK b/etc/nls/src/mk_MK
index baae0da..ff2b0b6 100644
--- a/etc/nls/src/mk_MK
+++ b/etc/nls/src/mk_MK
@@ -1,5 +1,27 @@
 comment_char %
 escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Macedonian language locale for Macedonia
 % Damjan Georgievski <gdamjan@freemail.org.mk> 
 % Revision: 1.8 (2000-11-07)
@@ -162,3 +184,4 @@
 measurement    1
 END LC_MEASUREMENT
 
+
diff --git a/etc/nls/src/mr_IN b/etc/nls/src/mr_IN
index f663f1d..fa082d0 100644
--- a/etc/nls/src/mr_IN
+++ b/etc/nls/src/mr_IN
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Marathi language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/ms_MY b/etc/nls/src/ms_MY
index 1685f8e..3845b16 100644
--- a/etc/nls/src/ms_MY
+++ b/etc/nls/src/ms_MY
@@ -1,6 +1,27 @@
 comment_char    %
 escape_char     /
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Malay language locale for Malaysia.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
@@ -214,3 +235,4 @@
 END LC_MEASUREMENT
 
 
+
diff --git a/etc/nls/src/mt_MT b/etc/nls/src/mt_MT
index 6279471..0d28e90 100644
--- a/etc/nls/src/mt_MT
+++ b/etc/nls/src/mt_MT
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Maltese language locale for Malta.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/nl_BE b/etc/nls/src/nl_BE
index e826a5c..d1244a0 100644
--- a/etc/nls/src/nl_BE
+++ b/etc/nls/src/nl_BE
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Dutch Language Locale for Belgium
 % Source: RAP
diff --git a/etc/nls/src/nl_BE.euro b/etc/nls/src/nl_BE.euro
index 1083014..1e6e38c 100644
--- a/etc/nls/src/nl_BE.euro
+++ b/etc/nls/src/nl_BE.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Dutch Language Locale for Belgium with Euro
 % Language: nl
diff --git a/etc/nls/src/nl_NL b/etc/nls/src/nl_NL
index 1c5236b..ce6c3a4 100644
--- a/etc/nls/src/nl_NL
+++ b/etc/nls/src/nl_NL
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Dutch Language Locale for the Netherlands
 % Source: RAP
diff --git a/etc/nls/src/nl_NL.euro b/etc/nls/src/nl_NL.euro
index 54e3e2a..1ffce88 100644
--- a/etc/nls/src/nl_NL.euro
+++ b/etc/nls/src/nl_NL.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Dutch Language Locale for the Netherlands with Euro
 % Language: nl
diff --git a/etc/nls/src/nn_NO b/etc/nls/src/nn_NO
index ab4be1c..748f586 100644
--- a/etc/nls/src/nn_NO
+++ b/etc/nls/src/nn_NO
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Nynorsk language locale for Norway.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/no_NO b/etc/nls/src/no_NO
index cbf04e8..0479571 100644
--- a/etc/nls/src/no_NO
+++ b/etc/nls/src/no_NO
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Norwegian language locale for Norway
 % Source: Norsk Standardiseringsforbund
 % Address: University Library,
diff --git a/etc/nls/src/oc_FR b/etc/nls/src/oc_FR
index f09b113..0f3457b 100644
--- a/etc/nls/src/oc_FR
+++ b/etc/nls/src/oc_FR
@@ -1,5 +1,27 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % charset "ISO_8859-1:1987"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/etc/nls/src/pl_PL b/etc/nls/src/pl_PL
index 9dac159..cade10f 100644
--- a/etc/nls/src/pl_PL
+++ b/etc/nls/src/pl_PL
@@ -1,5 +1,26 @@
 comment_char %
 escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Polish Language Locale for Poland
 % Source: RAP
diff --git a/etc/nls/src/pt_BR b/etc/nls/src/pt_BR
index 9230387..7eead28 100644
--- a/etc/nls/src/pt_BR
+++ b/etc/nls/src/pt_BR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Portuguese Language Locale for Brasil
 % Source: RAP
diff --git a/etc/nls/src/pt_PT b/etc/nls/src/pt_PT
index be2eb00..46dc0cd 100644
--- a/etc/nls/src/pt_PT
+++ b/etc/nls/src/pt_PT
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Portuguese Language Locale for Portugal
 % Source: RAP
diff --git a/etc/nls/src/pt_PT.euro b/etc/nls/src/pt_PT.euro
index c29da1e..cee648d 100644
--- a/etc/nls/src/pt_PT.euro
+++ b/etc/nls/src/pt_PT.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Portuguese Language Locale for Portugal with Euro
 % Language: pt
diff --git a/etc/nls/src/ro_RO b/etc/nls/src/ro_RO
index 45778db..4f6961d 100644
--- a/etc/nls/src/ro_RO
+++ b/etc/nls/src/ro_RO
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Romanian Language Locale for Romania
 % Source: RAP
diff --git a/etc/nls/src/ru_RU b/etc/nls/src/ru_RU
index d972a7b..075ff55 100644
--- a/etc/nls/src/ru_RU
+++ b/etc/nls/src/ru_RU
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Russian Language Locale for Russia
 % Source: RAP
diff --git a/etc/nls/src/ru_UA b/etc/nls/src/ru_UA
index 6379c81..ffcb904 100644
--- a/etc/nls/src/ru_UA
+++ b/etc/nls/src/ru_UA
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Russian Language Locale for Ukraine
 % Source: RFC 2319
diff --git a/etc/nls/src/se_NO b/etc/nls/src/se_NO
index 62a68e8..509cb83 100644
--- a/etc/nls/src/se_NO
+++ b/etc/nls/src/se_NO
@@ -1,6 +1,26 @@
-#	$Id: se_NO,v 1.1 2001/11/16 01:26:50 drepper Exp $	
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Northern Saami Language Locale for Norway
 % Source: http://www.hum.uit.no/a/trond/loc.html
diff --git a/etc/nls/src/sk_SK b/etc/nls/src/sk_SK
index a69821d..fe37234 100644
--- a/etc/nls/src/sk_SK
+++ b/etc/nls/src/sk_SK
@@ -1,5 +1,26 @@
-escape_char /
 comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Slovak Language Locale for Slovak
 % Source:
diff --git a/etc/nls/src/sl_SI b/etc/nls/src/sl_SI
index 52314d6..3e72d7d 100644
--- a/etc/nls/src/sl_SI
+++ b/etc/nls/src/sl_SI
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Slovenian language locale for Slovenia
 % Source: USM/MZT
diff --git a/etc/nls/src/sq_AL b/etc/nls/src/sq_AL
index 6e2aabc..721ad2f 100644
--- a/etc/nls/src/sq_AL
+++ b/etc/nls/src/sq_AL
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Albanian language locale for Albania.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/sr_YU b/etc/nls/src/sr_YU
index 4b43fd4..70738df 100644
--- a/etc/nls/src/sr_YU
+++ b/etc/nls/src/sr_YU
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Serbian Language Locale for Yugoslavia
 % Source: USM/MZT
diff --git a/etc/nls/src/sr_YU.cyrillic b/etc/nls/src/sr_YU.cyrillic
index e22e28e..5cdfb92 100644
--- a/etc/nls/src/sr_YU.cyrillic
+++ b/etc/nls/src/sr_YU.cyrillic
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Serbian Language Locale for Yugoslavia
 % Source: USM/MZT
diff --git a/etc/nls/src/sv_FI b/etc/nls/src/sv_FI
index db6824b..d825846 100644
--- a/etc/nls/src/sv_FI
+++ b/etc/nls/src/sv_FI
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Swedish Language Locale for Finland
 % Source: RAP
diff --git a/etc/nls/src/sv_FI.euro b/etc/nls/src/sv_FI.euro
index a96763a..2f7ee6c 100644
--- a/etc/nls/src/sv_FI.euro
+++ b/etc/nls/src/sv_FI.euro
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Swedish Language Locale for Finland with Euro
 % Language: sv
diff --git a/etc/nls/src/sv_SE b/etc/nls/src/sv_SE
index 5909b48..255d068 100644
--- a/etc/nls/src/sv_SE
+++ b/etc/nls/src/sv_SE
@@ -1,6 +1,27 @@
-escape_char	/
-comment_char    %
-
+comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Swedish language locale for Sweden
 % Source: RAP
 % Address: Sankt Jo//rgens Alle 8
diff --git a/etc/nls/src/ta_IN b/etc/nls/src/ta_IN
index 616d087..13192cc 100644
--- a/etc/nls/src/ta_IN
+++ b/etc/nls/src/ta_IN
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Tamil language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/te_IN b/etc/nls/src/te_IN
index adf01aa..8d9e77e 100644
--- a/etc/nls/src/te_IN
+++ b/etc/nls/src/te_IN
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Telgu language locale for India.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/tg_TJ b/etc/nls/src/tg_TJ
index 54e258f..57c288f 100644
--- a/etc/nls/src/tg_TJ
+++ b/etc/nls/src/tg_TJ
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Tajik Language Locale for Tajikistan
 % Source:
diff --git a/etc/nls/src/th_TH b/etc/nls/src/th_TH
index dae8d15..af2f2a1 100644
--- a/etc/nls/src/th_TH
+++ b/etc/nls/src/th_TH
@@ -1,6 +1,26 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Thailand (Thai) locale
 %
diff --git a/etc/nls/src/ti_ER b/etc/nls/src/ti_ER
index 9caf550..ea00b87 100644
--- a/etc/nls/src/ti_ER
+++ b/etc/nls/src/ti_ER
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Tigrigna language locale for Eritrea.
 % Contributed by Daniel Yacob <yacob@geez.org>
 % Charset: UTF-8
diff --git a/etc/nls/src/ti_ET b/etc/nls/src/ti_ET
index 6c25112..3f8e731 100644
--- a/etc/nls/src/ti_ET
+++ b/etc/nls/src/ti_ET
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Tigrigna language locale for Ethiopia.
 % Contributed by Daniel Yacob <yacob@geez.org>
 % Charset: UTF-8
diff --git a/etc/nls/src/tl_PH b/etc/nls/src/tl_PH
index 8586646..dbd2312 100644
--- a/etc/nls/src/tl_PH
+++ b/etc/nls/src/tl_PH
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Tagalog Language Locale for Philipines
 % Source:
diff --git a/etc/nls/src/tr_TR b/etc/nls/src/tr_TR
index 256b3e7..5abdceb 100644
--- a/etc/nls/src/tr_TR
+++ b/etc/nls/src/tr_TR
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Turkish Language Locale for Turkey
 % Source: RAP
diff --git a/etc/nls/src/translit_circle b/etc/nls/src/translit_circle
index 0b337e7..c68c918 100644
--- a/etc/nls/src/translit_circle
+++ b/etc/nls/src/translit_circle
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of encircled characters.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<circle>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/translit_cjk_compat b/etc/nls/src/translit_cjk_compat
index 18fc3aa..8adab4c 100644
--- a/etc/nls/src/translit_cjk_compat
+++ b/etc/nls/src/translit_cjk_compat
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of CJK compatibility characters.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<square>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/translit_cjk_variants b/etc/nls/src/translit_cjk_variants
index 5db4bee..e8954e0 100644
--- a/etc/nls/src/translit_cjk_variants
+++ b/etc/nls/src/translit_cjk_variants
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of CJK characters.
 % Generated from the UniVariants table
 %       Name:           Unicode variants table
diff --git a/etc/nls/src/translit_combining b/etc/nls/src/translit_combining
index 86a932b..10418e5 100644
--- a/etc/nls/src/translit_combining
+++ b/etc/nls/src/translit_combining
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations that remove all combining characters (accents,
 % pronounciation marks, etc.).
 % Generated from UnicodeData.txt.
diff --git a/etc/nls/src/translit_compat b/etc/nls/src/translit_compat
index 8bc7b78..e3b8ce7 100644
--- a/etc/nls/src/translit_compat
+++ b/etc/nls/src/translit_compat
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of compatibility characters and ligatures.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<compat>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/translit_et b/etc/nls/src/translit_et
index b7e9452..ad1727d 100644
--- a/etc/nls/src/translit_et
+++ b/etc/nls/src/translit_et
@@ -1,3 +1,28 @@
+comment_char %
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+
 LC_CTYPE
 translit_start
 # hoy sadis followed by a vowel
diff --git a/etc/nls/src/translit_font b/etc/nls/src/translit_font
index b73d3e6..83c8981 100644
--- a/etc/nls/src/translit_font
+++ b/etc/nls/src/translit_font
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of font equivalents.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<font>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/translit_fraction b/etc/nls/src/translit_fraction
index 50dbd78..e02049a 100644
--- a/etc/nls/src/translit_fraction
+++ b/etc/nls/src/translit_fraction
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of fractions.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<fraction>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/translit_hangul b/etc/nls/src/translit_hangul
index 0bea035..26258bb 100644
--- a/etc/nls/src/translit_hangul
+++ b/etc/nls/src/translit_hangul
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of Hangul syllables to Jamo.
 % Generated algorithmically.
 
diff --git a/etc/nls/src/translit_narrow b/etc/nls/src/translit_narrow
index 65a1dd3..4e27dbe 100644
--- a/etc/nls/src/translit_narrow
+++ b/etc/nls/src/translit_narrow
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of narrow equivalents.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<narrow>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/translit_neutral b/etc/nls/src/translit_neutral
index 4b181b5..a617835 100644
--- a/etc/nls/src/translit_neutral
+++ b/etc/nls/src/translit_neutral
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Language and locale neutral transliterations.
 
 LC_CTYPE
diff --git a/etc/nls/src/translit_small b/etc/nls/src/translit_small
index b70bf83..13b51a6 100644
--- a/etc/nls/src/translit_small
+++ b/etc/nls/src/translit_small
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of small equivalents.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<small>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/translit_wide b/etc/nls/src/translit_wide
index d555fa0..79f8903 100644
--- a/etc/nls/src/translit_wide
+++ b/etc/nls/src/translit_wide
@@ -1,6 +1,27 @@
-escape_char /
 comment_char %
-
+escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Transliterations of wide equivalents.
 % Generated through
 %   $ grep '^[^;]*;[^;]*;[^;]*;[^;]*;[^;]*;<wide>[^;]*;' UnicodeData.txt | \
diff --git a/etc/nls/src/tt_RU b/etc/nls/src/tt_RU
index 6dd5aba..aaee258 100644
--- a/etc/nls/src/tt_RU
+++ b/etc/nls/src/tt_RU
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Tatar Language Locale for Tatarstan
 % Source:
diff --git a/etc/nls/src/uk_UA b/etc/nls/src/uk_UA
index d188291..a9610cc 100644
--- a/etc/nls/src/uk_UA
+++ b/etc/nls/src/uk_UA
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Ukrainian Language Locale for Ukraine
 % Source: RFC 2319
diff --git a/etc/nls/src/ur_PK b/etc/nls/src/ur_PK
index 18756c6..9ec0219 100644
--- a/etc/nls/src/ur_PK
+++ b/etc/nls/src/ur_PK
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Urdu Language Locale for Pakistan
 % Source:
diff --git a/etc/nls/src/uz_UZ b/etc/nls/src/uz_UZ
index b98746a..bb94b0a 100644
--- a/etc/nls/src/uz_UZ
+++ b/etc/nls/src/uz_UZ
@@ -1,6 +1,27 @@
+comment_char %
 escape_char  /
-comment_char  %
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Uzbek language locale for Uzbekistan
 % Source: Bobir Ismailov
 % Contact: Bobir Ismailov, Pablo Saratxaga
diff --git a/etc/nls/src/vi_VN b/etc/nls/src/vi_VN
index c6567dd..69c575e 100644
--- a/etc/nls/src/vi_VN
+++ b/etc/nls/src/vi_VN
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Vietnamese language locale for Vietnam.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/yi_US b/etc/nls/src/yi_US
index 22d5963..27a3bc0 100644
--- a/etc/nls/src/yi_US
+++ b/etc/nls/src/yi_US
@@ -1,5 +1,27 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % charset "CP1255"
 % Distribution and use is free, also for commercial purposes.
 
diff --git a/etc/nls/src/zh_CN b/etc/nls/src/zh_CN
index 9831a06..e344940 100644
--- a/etc/nls/src/zh_CN
+++ b/etc/nls/src/zh_CN
@@ -1,5 +1,26 @@
 comment_char %
 escape_char  /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Chinese language locale for the Peoples Republic of China
 %
diff --git a/etc/nls/src/zh_HK b/etc/nls/src/zh_HK
index 17c2fd3..35e53ce 100644
--- a/etc/nls/src/zh_HK
+++ b/etc/nls/src/zh_HK
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Chinese language locale for Hong Kong.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/zh_SG b/etc/nls/src/zh_SG
index 36b5d1a..08097be 100644
--- a/etc/nls/src/zh_SG
+++ b/etc/nls/src/zh_SG
@@ -1,5 +1,27 @@
 comment_char    %
 escape_char     /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
 % Chinese language locale for Singapore.
 % Contributed by Kentaroh Noji <knoji@jp.ibm.com> and
 % Tetsuji Orita <orita@jp.ibm.com>.
diff --git a/etc/nls/src/zh_TW b/etc/nls/src/zh_TW
index 5dc9ca6..b3fdb3f 100644
--- a/etc/nls/src/zh_TW
+++ b/etc/nls/src/zh_TW
@@ -1,5 +1,26 @@
 comment_char %
 escape_char /
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Licensed to the Apache Software  Foundation (ASF) under one or more
+% contributor  license agreements.  See  the NOTICE  file distributed
+% with  this  work  for  additional information  regarding  copyright
+% ownership.   The ASF  licenses this  file to  you under  the Apache
+% License, Version  2.0 (the  License); you may  not use  this file  
+% except in  compliance with the License.   You may obtain  a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the  License is distributed on an  "AS IS" BASIS,
+% WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+% implied.   See  the License  for  the  specific language  governing
+% permissions and limitations under the License.
+%
+% Copyright 1999-2007 Rogue Wave Software, Inc.
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Chinese language locale for Taiwan R.O.C.
 % charmap: BIG5-CP950
diff --git a/examples/manual/codecvt1.cpp b/examples/manual/codecvt1.cpp
index 5df02fc..78e1614 100644
--- a/examples/manual/codecvt1.cpp
+++ b/examples/manual/codecvt1.cpp
@@ -207,16 +207,18 @@
     try {
        for (int i = 0; i != sizeof locales / sizeof *locales; i++) 
            do_roundtrip_conversion (locales [i].name, locales [i].buffer);
-    }
-    catch (...) {
-        return 1;
-    }
 
-    try {
-        do_diff_conversion ();
+       do_diff_conversion ();
+    }
+    catch (const std::exception &e) {
+        std::cout << "Caught an exception: " << e.what () << std::endl;
+
+        return 1;   // Indicate failure.
     }
     catch (...) {
-        return 2;
+        std::cout << "Caught an unknown exception" << std::endl;
+
+        return 1;   // Indicate failure.
     }
 
     return 0;
diff --git a/examples/manual/ctype.cpp b/examples/manual/ctype.cpp
index 18c7f8c..2b342a8 100644
--- a/examples/manual/ctype.cpp
+++ b/examples/manual/ctype.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
  
@@ -49,7 +49,7 @@
               << std::endl;
 
     // Convert characters to upper case.
-    ct.toupper (s, s + sizeof s / sizeof *s);
+    (ct.toupper)(s, s + sizeof s / sizeof *s);
     std::cout << s << std::endl;
   
     return 0;
diff --git a/examples/manual/fmtflags_manip.cpp b/examples/manual/fmtflags_manip.cpp
index 96e6c96..9623dce 100644
--- a/examples/manual/fmtflags_manip.cpp
+++ b/examples/manual/fmtflags_manip.cpp
@@ -42,7 +42,7 @@
     std::ios_base::fmtflags  saved_;
 
 public:
-    fmtflags_manip (): strm_ (), saved_ () { }
+    fmtflags_manip (): strm_ (), saved_ (std::ios_base::fmtflags (-1)) { }
 
     void operator() (std::ios_base           &strm,
                      std::ios_base::fmtflags  flags) const {
diff --git a/examples/tutorial/dynatype.cpp b/examples/tutorial/dynatype.cpp
index 97ebd87..d9dd506 100644
--- a/examples/tutorial/dynatype.cpp
+++ b/examples/tutorial/dynatype.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2005 Rogue Wave Software.
+ * Copyright 2001-2005, 2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -43,10 +43,7 @@
     struct map {
         typedef std::map<const dynatype*, T> map_type;
         
-        static map_type& get () {
-            static map_type m;
-            return m;
-        }
+        static map_type& get ();
     };
 
     // helper: removes this instance of dynatype from map
@@ -58,6 +55,8 @@
     // helper: copies one instance of dynatype to another
     template <class T>
     void copy (const dynatype &rhs) {
+        // cast to <const T&> instead of <T> to avoid error on gcc 3.4.4/cygwin:
+        // error: invalid static_cast from type `const dynatype' to type `int'
         *this = static_cast<const T&>(rhs);
     }
 
@@ -112,26 +111,41 @@
 
 // 14.7.3, p6 - explicit specializations must be defined before first use
 template <>
-inline void dynatype::remove<void> ()
+void dynatype::
+remove<void> ()
 { /* no-op */ }
 
 
 template <>
-inline void dynatype::copy<void> (const dynatype&)
+void dynatype::
+copy<void> (const dynatype&)
 { /* no-op */ }
 
 
 // initialize with pointers to no-ops
-inline dynatype::dynatype ()
+dynatype::
+dynatype ()
     : p_remove (&dynatype::remove<void>),
       p_copy (&dynatype::copy<void>)
 {
 }
 
 
+template <class T>
+typename dynatype::map<T>::map_type&
+dynatype::map<T>::
+get ()
+{
+    static map_type m;
+
+    return m;
+}
+
+
 // construct a dynatype object from a value of any type
 template <class T>
-inline dynatype::dynatype (const T &t)
+dynatype::
+dynatype (const T &t)
     : p_remove (&dynatype::remove<T>),
       p_copy (&dynatype::copy<T>)
 {
@@ -140,7 +154,8 @@
 
 
 // assign one dynatype object to another
-inline dynatype& dynatype::operator= (const dynatype &rhs)
+dynatype& dynatype::
+operator= (const dynatype &rhs)
 {
     if (this != &rhs) {
         // remove `this' from the associated map
@@ -159,7 +174,8 @@
 
 // assign a value of any type to an instance of dynatype
 template <class T>
-inline dynatype& dynatype::operator= (const T &t)
+dynatype& dynatype::
+operator= (const T &t)
 {
     // remove `this' from the map of the corresponding type
     (this->*p_remove)();
diff --git a/examples/tutorial/graph.cpp b/examples/tutorial/graph.cpp
index 3bb25c1..866ea0f 100644
--- a/examples/tutorial/graph.cpp
+++ b/examples/tutorial/graph.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2006, 2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -34,16 +34,9 @@
 
 #include <examples.h>
 
-typedef
-    std::map<std::string, int, std::less<std::string>,
-             std::allocator<std::pair<const std::string, int> > > stringVector;
-
-typedef
-    std::map<std::string, stringVector, std::less<std::string>,
-             std::allocator<std::pair<const std::string,
-                                           stringVector > > >     graph;
-
-typedef std::pair<unsigned,std::string> DistancePair;
+typedef std::map<std::string, int>       Distances;
+typedef std::map<std::string, Distances> Cities;
+typedef std::pair<unsigned, std::string> DistancePair;
 
 bool operator< (const DistancePair& lhs, const DistancePair& rhs) {
     
@@ -57,17 +50,11 @@
 }
 
 
-std::string pendleton ("Pendleton");
-std::string pensacola ("Pensacola");
-std::string peoria ("Peoria");
-std::string phoenix ("Phoenix");
-std::string pierre ("Pierre");
-std::string pittsburgh ("Pittsburgh");
-std::string princeton ("Princeton");
-std::string pueblo ("Pueblo");
-
-void shortestDistance (graph& city_map, std::string& start_city,
-                       stringVector& distances) {
+static void
+shortestDistance (Cities            &city_map,
+                  const std::string &start_city,
+                  Distances         &dist)
+{
     
     // Process a priority queue of distances to nodes.
     std::priority_queue<DistancePair,
@@ -85,15 +72,15 @@
         que.pop ();
 
         // If we haven't seen it already, process it.
-        if (0 == distances.count (city))
+        if (0 == dist.count (city))
         {
             // Then add it to shortest distance map.
-            distances[city] = distance;
+            dist[city] = distance;
 
             // And put values into queue.
-            const stringVector& cities = city_map[city];
-            stringVector::const_iterator start = cities.begin ();
-            stringVector::const_iterator stop  = cities.end ();
+            const Distances& cities = city_map[city];
+            Distances::const_iterator start = cities.begin ();
+            Distances::const_iterator stop  = cities.end ();
 
             for (; start != stop; ++start) 
                 que.push (DistancePair (distance + (*start).second,
@@ -103,15 +90,23 @@
 }
 
 
-// Global city map
-graph cityMap;
-
 int main () {
     
     std::cout << "Graph example program "
               << " - find shortest path in a directed graph." 
               << std::endl;
 
+    static const char pendleton[]  = "Pendleton";
+    static const char pensacola[]  = "Pensacola";
+    static const char peoria[]     = "Peoria";
+    static const char phoenix[]    = "Phoenix";
+    static const char pierre[]     = "Pierre";
+    static const char pittsburgh[] = "Pittsburgh";
+    static const char princeton[]  = "Princeton";
+    static const char pueblo[]     = "Pueblo";
+
+    Cities cityMap;
+
     cityMap[pendleton][phoenix]    = 4;
     cityMap[pendleton][pueblo]     = 8;
     cityMap[pensacola][phoenix]    = 5;
@@ -125,23 +120,19 @@
     cityMap[princeton][pittsburgh] = 2;
     cityMap[pueblo][pierre]        = 3;
     
-    stringVector distances;
+    Distances dist;
     
-    shortestDistance (cityMap, pierre, distances);
-    stringVector::iterator where;
+    shortestDistance (cityMap, pierre, dist);
+    Distances::iterator where;
 
     std::cout << "Find the shortest path from : " 
-              << pierre.c_str () << std::endl;
+              << pierre << '\n';
 
-    for (where = distances.begin (); where != distances.end (); ++where)
+    for (where = dist.begin (); where != dist.end (); ++where)
         std::cout << "  Distance to: " << (*where).first << ":"
-                  <<  (*where).second << std::endl;
+                  <<  (*where).second << '\n';
         
-    std::cout << "End of graph example program" << std::endl;
+    std::cout << "End of graph example program" << '\n';
 
     return 0;
 }
-
-
-
-
diff --git a/generate.bat b/generate.bat
index 2c318f0..849375d 100644
--- a/generate.bat
+++ b/generate.bat
@@ -1,25 +1,21 @@
-@echo off
+::
+:: Licensed to the Apache Software  Foundation (ASF) under one or more
+:: contributor  license agreements.  See  the NOTICE  file distributed
+:: with  this  work  for  additional information  regarding  copyright
+:: ownership.   The ASF  licenses this  file to  you under  the Apache
+:: License, Version  2.0 (the  "License"); you may  not use  this file
+:: except in  compliance with the License.   You may obtain  a copy of
+:: the License at
+::
+:: http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the  License is distributed on an  "AS IS" BASIS,
+:: WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+:: implied.   See  the License  for  the  specific language  governing
+:: permissions and limitations under the License.
+::
+:: Copyright 1999-2007 Rogue Wave Software, Inc.
+::
 
-set exedir=
-
-if exist %SystemRoot%\SysWow64\cscript.exe set exedir=%SystemRoot%\SysWow64\
-
-set ERRORLEVEL=0
-%exedir%cscript /? > nul
-if %errorlevel% neq 0 (
-echo "Windows scripting host is not installed. Please install it."
-set ERRORLEVEL=1
-goto :EOF
-)
-
-set scriptdir=etc\config\windows
-set rungen=generate.wsf
-
-set runfile=%~dp0\%scriptdir%\%rungen%
-
-%exedir%cscript /nologo %runfile% %*
-if %errorlevel% neq 0 (
-echo "Solution generation script failed."
-set ERRORLEVEL=1
-goto :EOF
-)
+@%~dp0configure.bat %*
diff --git a/include/algorithm.c b/include/algorithm.c
index fea7f70..8d605b0 100644
--- a/include/algorithm.c
+++ b/include/algorithm.c
@@ -2,20 +2,27 @@
  *
  * algorithm.c
  *
- * $Id: //stdlib/dev/include/algorithm.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ansi/_cwchar.h b/include/ansi/_cwchar.h
index 8f59905..fff8bda 100644
--- a/include/ansi/_cwchar.h
+++ b/include/ansi/_cwchar.h
@@ -56,11 +56,11 @@
 struct tm;
 
 #ifndef WCHAR_MIN
-#  define WCHAR_MIN _RWSTD_WCHAR_T_MIN
+#  define WCHAR_MIN _RWSTD_WCHAR_MIN
 #endif   // WCHAR_MIN
 
 #ifndef WCHAR_MAX
-#  define WCHAR_MAX _RWSTD_WCHAR_T_MAX
+#  define WCHAR_MAX _RWSTD_WCHAR_MAX
 #endif   // WCHAR_MAX
 
 #ifndef WEOF
diff --git a/include/ansi/climits b/include/ansi/climits
index 195c5ca..47404fe 100644
--- a/include/ansi/climits
+++ b/include/ansi/climits
@@ -107,4 +107,9 @@
 
 #endif  // _RWSTD_NO_PURE_C_HEADERS
 
+#if (MB_LEN_MAX != _RWSTD_MB_LEN_MAX)
+#  undef MB_LEN_MAX
+#  define MB_LEN_MAX _RWSTD_MB_LEN_MAX
+#endif   // MB_LEN_MAX
+
 #endif   // _RWSTD_CLIMITS_INCLUDED
diff --git a/include/ansi/csetjmp b/include/ansi/csetjmp
index f273bb9..ce726f2 100644
--- a/include/ansi/csetjmp
+++ b/include/ansi/csetjmp
@@ -54,7 +54,7 @@
 #endif   // _RWSTD_NAMESPACE_STD_OPEN == 9
 
 #else   // if defined (_RWSTD_NO_DEPRECATED_C_HEADERS)
-#undef setjmp
+
 #ifndef _RWSTD_CSETJMP_INCLUDED
 #define _RWSTD_CSETJMP_INCLUDED
 
@@ -77,4 +77,8 @@
 
 #endif   // _RWSTD_NO_DEPRECATED_C_HEADERS
 
+#ifndef setjmp
+#  define setjmp(env) setjmp (env)
+#endif
+
 #endif   // _RWSTD_NO_PURE_C_HEADERS
diff --git a/include/ansi/cwchar b/include/ansi/cwchar
index d78b908..889d93c 100644
--- a/include/ansi/cwchar
+++ b/include/ansi/cwchar
@@ -113,7 +113,7 @@
 
 #ifndef _RWSTD_NO_STRUCT_TM_IN_WCHAR_H
 using ::tm;
-#elif !defined (_RWSTD_NO_TM)
+#elif !defined (_RWSTD_NO_STRUCT_TM)
 
 }   // namespace std
 
@@ -121,6 +121,8 @@
 
 namespace std {
 
+using ::tm;
+
 #endif   // NO_STRUCT_TM
 
 #ifndef _RWSTD_NO_BTOWC
diff --git a/include/ansi/limits.h b/include/ansi/limits.h
index fb2bcd1..d0951bd 100644
--- a/include/ansi/limits.h
+++ b/include/ansi/limits.h
@@ -115,4 +115,9 @@
 #  endif   // _POSIX_PATH_MAX
 #endif   // HP-UX
 
+#if (MB_LEN_MAX != _RWSTD_MB_LEN_MAX)
+#  undef MB_LEN_MAX
+#  define MB_LEN_MAX _RWSTD_MB_LEN_MAX
+#endif   // MB_LEN_MAX
+
 #endif   // _RWSTD_LIMITS_H_INCLUDED
diff --git a/include/ansi/wchar.h b/include/ansi/wchar.h
index 2807222..0aa708f 100644
--- a/include/ansi/wchar.h
+++ b/include/ansi/wchar.h
@@ -198,4 +198,213 @@
 
 #  include _RWSTD_ANSI_C_WCHAR_H
 
+#  include <rw/_mbstate.h>
+
+#  ifndef WCHAR_MAX
+#    define WCHAR_MAX   _RWSTD_WCHAR_MAX
+#  endif
+
+#  ifndef WCHAR_MIN
+#    define WCHAR_MIN   _RWSTD_WCHAR_MIN
+#  endif
+
+extern "C" {
+
+// add missing declarations for functions known to be defined
+// in the system libc
+
+#  if defined (_RWSTD_NO_MBSTATE_T) && defined (_RWSTD_MBSTATE_T)
+typedef _RWSTD_MBSTATE_T mbstate_t;
+#  endif   // _RWSTD_NO_MBSTATE_T && _RWSTD_MBSTATE_T
+
+#  if defined (_RWSTD_NO_FWPRINTF) && !defined (_RWSTD_NO_FWPRINTF_IN_LIBC)
+int fwprintf (FILE*, const wchar_t*, ...);
+#    undef _RWSTD_NO_FWPRINTF
+#  endif   // _RWSTD_NO_FWPRINTF && !_RWSTD_NO_FWPRINTF_IN_LIBC
+
+#  if defined (_RWSTD_NO_FWSCANF) && !defined (_RWSTD_NO_FWSCANF_IN_LIBC)
+int fwscanf (FILE*, const wchar_t*, ...);
+#    undef _RWSTD_NO_FWSCANF
+#  endif   // _RWSTD_NO_FWSCANF && !_RWSTD_NO_FWSCANF_IN_LIBC
+
+#  if defined (_RWSTD_NO_SWPRINTF) && !defined (_RWSTD_NO_SWPRINTF_IN_LIBC)
+#    if !defined (_MSC_VER)
+
+// disabled for MSVC to avoid running into its awful declaration hackery
+int swprintf (wchar_t*, _RWSTD_SIZE_T, const wchar_t*, ...);
+
+#    endif   // !MSVC
+#    undef _RWSTD_NO_SWPRINTF
+#  endif   // _RWSTD_NO_SWPRINTF && !_RWSTD_NO_SWPRINTF_IN_LIBC
+
+#  if defined (_RWSTD_NO_SWSCANF) && !defined (_RWSTD_NO_SWSCANF_IN_LIBC)
+int swscanf (const wchar_t*, const wchar_t*, ...);
+#    undef _RWSTD_NO_SWSCANF
+#  endif   // _RWSTD_NO_SWSCANF && !_RWSTD_NO_SWSCANF_IN_LIBC
+
+#  ifdef _RWSTD_VA_LIST
+#    if defined (_RWSTD_NO_VFWPRINTF) && !defined (_RWSTD_NO_VFWPRINTF_IN_LIBC)
+int vfwprintf (FILE*, const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VFWPRINTF
+#    endif   // _RWSTD_NO_VFWPRINTF && !_RWSTD_NO_VFWPRINTF_IN_LIBC
+
+#    if defined (_RWSTD_NO_VFWSCANF) && !defined (_RWSTD_NO_VFWSCANF_IN_LIBC)
+int vfwscanf (FILE*, const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VFWSCANF
+#    endif   // _RWSTD_NO_VFWSCANF && !_RWSTD_NO_VFWSCANF_IN_LIBC
+
+#    if defined (_RWSTD_NO_VWPRINTF) && !defined (_RWSTD_NO_VWPRINTF_IN_LIBC)
+int vwprintf (const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VWPRINTF
+#    endif   // _RWSTD_NO_VWPRINTF && !_RWSTD_NO_VWPRINTF_IN_LIBC
+
+#    if defined (_RWSTD_NO_VWSCANF) && !defined (_RWSTD_NO_VWSCANF_IN_LIBC)
+int vwscanf (const wchar_t*, _RWSTD_VA_LIST);
+#      undef _RWSTD_NO_VWSCANF
+#    endif   // _RWSTD_NO_VWSCANF && !_RWSTD_NO_VWSCANF_IN_LIBC
+#  endif   // _RWSTD_VA_LIST
+
+#  if defined (_RWSTD_NO_MBRLEN) && !defined (_RWSTD_NO_MBRLEN_IN_LIBC)
+_RWSTD_SIZE_T mbrlen (const char*, _RWSTD_SIZE_T, _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBRLEN
+#  endif   // _RWSTD_NO_MBRLEN && !_RWSTD_NO_MBRLEN_IN_LIBC
+
+#  if defined (_RWSTD_NO_MBRTOWC) && !defined (_RWSTD_NO_MBRTOWC_IN_LIBC)
+_RWSTD_SIZE_T mbrtowc (wchar_t*, const char*, _RWSTD_SIZE_T, _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBRTOWC
+#  endif   // _RWSTD_NO_MBRTOWC && !_RWSTD_NO_MBRTOWC_IN_LIBC
+
+#  if defined (_RWSTD_NO_MBSINIT) && !defined (_RWSTD_NO_MBSINIT_IN_LIBC)
+int mbsinit (const _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBSINIT
+#  endif   // _RWSTD_NO_MBSINIT && !_RWSTD_NO_MBSINIT_IN_LIBC
+
+#  if defined (_RWSTD_NO_MBSRTOWCS) && !defined (_RWSTD_NO_MBSRTOWCS_IN_LIBC)
+_RWSTD_SIZE_T mbsrtowcs (const wchar_t*, const char**, _RWSTD_SIZE_T,
+                         _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_MBSRTOWCS
+#  endif   // _RWSTD_NO_MBSRTOWCS && !_RWSTD_NO_MBSRTOWCS_IN_LIBC
+
+#  if defined (_RWSTD_NO_WCRTOMB) && !defined (_RWSTD_NO_WCRTOMB_IN_LIBC)
+_RWSTD_SIZE_T wcrtomb (char*, wchar_t, _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_WCRTOMB
+#  endif   // _RWSTD_NO_WCRTOMB && !_RWSTD_NO_WCRTOMB_IN_LIBC
+
+#  if defined (_RWSTD_NO_WCSRTOMBS) && !defined (_RWSTD_NO_WCSRTOMBS_IN_LIBC)
+_RWSTD_SIZE_T wcsrtombs (char*,  const char**, _RWSTD_SIZE_T,
+                         _RWSTD_MBSTATE_T*);
+#    undef _RWSTD_NO_WCSRTOMBS
+#  endif   // _RWSTD_NO_WCSRTOMBS && !_RWSTD_NO_WCSRTOMBS_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WCSCHR) && !defined (_RWSTD_NO_WCSCHR_IN_LIBC)
+
+wchar_t* wcschr (wchar_t*, wchar_t);
+
+}   // extern "C"
+
+inline const wchar_t*
+wcschr (const wchar_t *__s, wchar_t __c)
+{
+    return wcschr (_RWSTD_CONST_CAST (wchar_t*, __s), __c);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WCSCHR
+#  endif   // _RWSTD_NO_WCSCHR && !_RWSTD_NO_WCSCHR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WCSRCHR) && !defined (_RWSTD_NO_WCSRCHR_IN_LIBC)
+
+wchar_t* wcsrchr (wchar_t*, wchar_t);
+
+}   // extern "C"
+
+inline const wchar_t*
+wcsrchr (const wchar_t *__s, wchar_t __c)
+{
+    return wcsrchr (_RWSTD_CONST_CAST (wchar_t*, __s), __c);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WCSCHR
+#  endif   // _RWSTD_NO_WCSCHR && !_RWSTD_NO_WCSCHR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WCSSTR) && !defined (_RWSTD_NO_WCSSTR_IN_LIBC)
+
+wchar_t* wcsstr (wchar_t*, const wchar_t*);
+
+}   // extern "C"
+
+inline const wchar_t*
+wcsstr (const wchar_t *__s1, const wchar_t *__s2)
+{
+    return wcsstr (_RWSTD_CONST_CAST (wchar_t*, __s1), __s2);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WCSSTR
+#  endif   // _RWSTD_NO_WCSSTR && !_RWSTD_NO_WCSSTR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WMEMCHR) && !defined (_RWSTD_NO_WMEMCHR_IN_LIBC)
+
+wchar_t* wmemchr (wchar_t*, wchar_t, _RWSTD_SIZE_T);
+
+}   // extern "C"
+
+inline const wchar_t*
+wmemchr (const wchar_t *__s, wchar_t __c, _RWSTD_SIZE_T __n)
+{
+    return wmemchr (_RWSTD_CONST_CAST (wchar_t*, __s), __c, __n);
+}
+
+extern "C" {
+
+#    undef _RWSTD_NO_WMEMCHR
+#  endif   // _RWSTD_NO_WMEMCHR && !_RWSTD_NO_WMEMCHR_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WMEMCMP) && !defined (_RWSTD_NO_WMEMCMP_IN_LIBC)
+int wmemcmp (const wchar_t*, const wchar_t*, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMCMP
+#  endif   // _RWSTD_NO_WMEMCMP && !_RWSTD_NO_WMEMCMP_IN_LIBC
+
+#  if defined (_RWSTD_NO_WMEMCPY) && !defined (_RWSTD_NO_WMEMCPY_IN_LIBC)
+wchar_t* wmemcpy (wchar_t*, const wchar_t*, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMCPY
+#  endif   // _RWSTD_NO_WMEMCPY && !_RWSTD_NO_WMEMCPY_IN_LIBC
+
+#  if defined (_RWSTD_NO_WMEMMOVE) && !defined (_RWSTD_NO_WMEMMOVE_IN_LIBC)
+wchar_t* wmemmove (wchar_t*, const wchar_t*, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMMOVE
+#  endif   // _RWSTD_NO_WMEMMOVE && !_RWSTD_NO_WMEMMOVE_IN_LIBC
+
+#  if defined (_RWSTD_NO_WMEMSET) && !defined (_RWSTD_NO_WMEMSET_IN_LIBC)
+wchar_t* wmemset (wchar_t*, wchar_t, _RWSTD_SIZE_T);
+#    undef _RWSTD_NO_WMEMSET
+#  endif   // _RWSTD_NO_WMEMSET && !_RWSTD_NO_WMEMSET_IN_LIBC
+
+
+#  if defined (_RWSTD_NO_WPRINTF) && !defined (_RWSTD_NO_WPRINTF_IN_LIBC)
+int wprintf (const wchar_t*, ...);
+#    undef _RWSTD_NO_WPRINTF
+#  endif   // _RWSTD_NO_WPRINTF && !_RWSTD_NO_WPRINTF_IN_LIBC
+
+#  if defined (_RWSTD_NO_WSCANF) && !defined (_RWSTD_NO_WSCANF_IN_LIBC)
+int wscanf (const wchar_t*, ...);
+#    undef _RWSTD_NO_WSCANF
+#  endif   // _RWSTD_NO_WSCANF && !_RWSTD_NO_WSCANF_IN_LIBC
+
+#  if defined (_RWSTD_NO_WCTOB) && !defined (_RWSTD_NO_WCTOB_IN_LIBC)
+int wctob (_RWSTD_WINT_T);
+#    undef _RWSTD_NO_WCTOB
+#  endif   // _RWSTD_NO_WCTOB && !_RWSTD_NO_WCTOB_IN_LIBC
+
+}   // extern "C"
+
 #endif   // _RWSTD_NO_DEPRECATED_C_HEADERS
diff --git a/include/bitset.c b/include/bitset.c
index 7a8014e..22d7232 100644
--- a/include/bitset.c
+++ b/include/bitset.c
@@ -2,20 +2,27 @@
  *
  * bitset.c
  *
- * $Id: //stdlib/dev/include/bitset.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/complex b/include/complex
index 4d22e52..415e601 100644
--- a/include/complex
+++ b/include/complex
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2000-2006 Rogue Wave Software.
+ * Copyright 2000-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -776,7 +776,7 @@
 //     phi = v2 * log(r1) + u2 * theta1
 _EXPORT
 template <class _TypeT>
-inline complex<_TypeT>
+complex<_TypeT>
 pow (const complex<_TypeT>&, const complex<_TypeT>&);
 
 
diff --git a/include/deque.c b/include/deque.c
index 54d1fa3..6b5f435 100644
--- a/include/deque.c
+++ b/include/deque.c
@@ -2,20 +2,27 @@
  *
  * deque.c
  *
- * $Id: //stdlib/dev/include/deque.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/fstream.c b/include/fstream.c
index 3625a53..66bc808 100644
--- a/include/fstream.c
+++ b/include/fstream.c
@@ -2,20 +2,27 @@
  *
  * fstream.c
  *
- * $Id: //stdlib/dev/include/fstream.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/fstream.cc b/include/fstream.cc
index e1f33af..d602bf6 100644
--- a/include/fstream.cc
+++ b/include/fstream.cc
@@ -7,22 +7,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1997-2006 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -351,8 +352,14 @@
         _RWSTD_STREAMSIZE __nchars;
 
         if (__unbuf) {
-            __buf    = &__c_to_char;
-            __nchars = 1;
+            if (this->_C_is_eof (__c)){
+                __buf    = 0;
+                __nchars = 0;
+            }
+            else {
+                __buf    = &__c_to_char;
+                __nchars = 1;
+            }
         }
         else {
             // call xsputn() with a special value to have it flush
diff --git a/include/istream.c b/include/istream.c
index 0c89a5e..2c15269 100644
--- a/include/istream.c
+++ b/include/istream.c
@@ -2,20 +2,27 @@
  *
  * istream.c
  *
- * $Id: //stdlib/dev/include/istream.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/limits b/include/limits
index 627165f..4beb6b3 100644
--- a/include/limits
+++ b/include/limits
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -86,69 +86,35 @@
 #endif   // _RWSTD_IS_IEC559
 
 
-_RWSTD_NAMESPACE (__rw) { 
+_RWSTD_NAMESPACE (__rw) {
+
+extern "C" {
 
 _RWSTD_EXPORT extern const float       __rw_flt_infinity;
 _RWSTD_EXPORT extern const double      __rw_dbl_infinity;
 
-#define _RWSTD_FLT_INFINITY            _RW::__rw_flt_infinity
-#define _RWSTD_DBL_INFINITY            _RW::__rw_dbl_infinity
-
 _RWSTD_EXPORT extern const float       __rw_flt_qNaN;
 _RWSTD_EXPORT extern const double      __rw_dbl_qNaN;
 
-#define _RWSTD_FLT_QNAN                _RW::__rw_flt_qNaN
-#define _RWSTD_DBL_QNAN                _RW::__rw_dbl_qNaN
+_RWSTD_EXPORT extern const float       __rw_flt_sNaN;
+_RWSTD_EXPORT extern const double      __rw_dbl_sNaN;
 
 _RWSTD_EXPORT extern const float       __rw_flt_denorm_min;
 _RWSTD_EXPORT extern const double      __rw_dbl_denorm_min;
 
-#define _RWSTD_FLT_DENORM_MIN          _RW::__rw_flt_denorm_min
-#define _RWSTD_DBL_DENORM_MIN          _RW::__rw_dbl_denorm_min
-
-
 #ifndef _RWSTD_NO_LONG_DOUBLE
 
 _RWSTD_EXPORT extern const long double __rw_ldbl_infinity;
 _RWSTD_EXPORT extern const long double __rw_ldbl_qNaN;
+_RWSTD_EXPORT extern const long double __rw_ldbl_sNaN;
 _RWSTD_EXPORT extern const long double __rw_ldbl_denorm_min;
 
-#  define _RWSTD_LDBL_INFINITY         _RW::__rw_ldbl_infinity
-#  define _RWSTD_LDBL_QNAN             _RW::__rw_ldbl_qNaN
-#  define _RWSTD_LDBL_DENORM_MIN       _RW::__rw_ldbl_denorm_min
-
 #endif   // _RWSTD_NO_LONG_DOUBLE
 
-}   // namespace __rw
-
-
-// signaling NAN
-#if defined (FLT_SNAN) && defined (DBL_SNAN) && defined (LDBL_SNAN)  // DEC osf
-#  define _RWSTD_FLT_SNAN    FLT_SNAN
-#  define _RWSTD_DBL_SNAN    DBL_SNAN
-#  define _RWSTD_LDBL_SNAN   LDBL_SNAN
-#else
-
-_RWSTD_NAMESPACE (__rw) { 
-
-_RWSTD_EXPORT extern const float       __rw_flt_sNaN;
-_RWSTD_EXPORT extern const double      __rw_dbl_sNaN;
-
-#  define _RWSTD_FLT_SNAN              _RW::__rw_flt_sNaN
-#  define _RWSTD_DBL_SNAN              _RW::__rw_dbl_sNaN
-
-#  ifndef _RWSTD_NO_LONG_DOUBLE
-
-_RWSTD_EXPORT extern const long double __rw_ldbl_sNaN;
-
-#    define _RWSTD_LDBL_SNAN           _RW::__rw_ldbl_sNaN
-
-#  endif   // _RWSTD_NO_LONG_DOUBLE
+}   // extern "C"
 
 }   // namespace __rw
 
-#endif   // FLT_SNAN && DBL_SNAN && LDBL_SNAN
-
 
 #ifndef _RWSTD_NO_SIGNALING_NAN
 #  define _RWSTD_HAS_SIG_NAN true
@@ -400,10 +366,10 @@
                    float_denorm_style (_RWSTD_FLT_HAS_DENORM));
     _RWSTD_STATIC (float, bool, has_denorm_loss, _RWSTD_HAS_DENORM_LOSS);
 
-    _RWSTD_STATIC_FUN (float, infinity,      _RWSTD_FLT_INFINITY)
-    _RWSTD_STATIC_FUN (float, quiet_NaN,     _RWSTD_FLT_QNAN)
-    _RWSTD_STATIC_FUN (float, signaling_NaN, _RWSTD_FLT_SNAN)
-    _RWSTD_STATIC_FUN (float, denorm_min,    _RWSTD_FLT_DENORM_MIN)
+    _RWSTD_STATIC_FUN (float, infinity,      _RW::__rw_flt_infinity)
+    _RWSTD_STATIC_FUN (float, quiet_NaN,     _RW::__rw_flt_qNaN)
+    _RWSTD_STATIC_FUN (float, signaling_NaN, _RW::__rw_flt_sNaN)
+    _RWSTD_STATIC_FUN (float, denorm_min,    _RW::__rw_flt_denorm_min)
 
     _RWSTD_STATIC (float, bool, is_iec559,  _RWSTD_IS_IEC559);
     _RWSTD_STATIC (float, bool, is_bounded, true);
@@ -447,10 +413,10 @@
                    float_denorm_style (_RWSTD_DBL_HAS_DENORM));
     _RWSTD_STATIC (double, bool, has_denorm_loss,   _RWSTD_HAS_DENORM_LOSS);
 
-    _RWSTD_STATIC_FUN (double, infinity,      _RWSTD_DBL_INFINITY)
-    _RWSTD_STATIC_FUN (double, quiet_NaN,     _RWSTD_DBL_QNAN)
-    _RWSTD_STATIC_FUN (double, signaling_NaN, _RWSTD_DBL_SNAN)
-    _RWSTD_STATIC_FUN (double, denorm_min,    _RWSTD_DBL_DENORM_MIN)
+    _RWSTD_STATIC_FUN (double, infinity,      _RW::__rw_dbl_infinity)
+    _RWSTD_STATIC_FUN (double, quiet_NaN,     _RW::__rw_dbl_qNaN)
+    _RWSTD_STATIC_FUN (double, signaling_NaN, _RW::__rw_dbl_sNaN)
+    _RWSTD_STATIC_FUN (double, denorm_min,    _RW::__rw_dbl_denorm_min)
 
     _RWSTD_STATIC (double, bool, is_iec559,  _RWSTD_IS_IEC559);
     _RWSTD_STATIC (double, bool, is_bounded, true);
@@ -496,10 +462,10 @@
                    float_denorm_style (_RWSTD_LDBL_HAS_DENORM));
     _RWSTD_STATIC (long double, bool, has_denorm_loss, _RWSTD_HAS_DENORM_LOSS);
 
-    _RWSTD_STATIC_FUN (long double, infinity,      _RWSTD_LDBL_INFINITY)
-    _RWSTD_STATIC_FUN (long double, quiet_NaN,     _RWSTD_LDBL_QNAN)
-    _RWSTD_STATIC_FUN (long double, signaling_NaN, _RWSTD_LDBL_SNAN)
-    _RWSTD_STATIC_FUN (long double, denorm_min,    _RWSTD_LDBL_DENORM_MIN)
+    _RWSTD_STATIC_FUN (long double, infinity,      _RW::__rw_ldbl_infinity)
+    _RWSTD_STATIC_FUN (long double, quiet_NaN,     _RW::__rw_ldbl_qNaN)
+    _RWSTD_STATIC_FUN (long double, signaling_NaN, _RW::__rw_ldbl_sNaN)
+    _RWSTD_STATIC_FUN (long double, denorm_min,    _RW::__rw_ldbl_denorm_min)
 
     _RWSTD_STATIC (long double, bool, is_iec559,  _RWSTD_IS_IEC559);
     _RWSTD_STATIC (long double, bool, is_bounded, true);
@@ -531,7 +497,7 @@
 #ifndef _RWSTD_NO_WCHAR_T
 #  ifndef _RWSTD_NO_NATIVE_WCHAR_T
 
-_RWSTD_SPECIALIZE_LIMITS (wchar_t, _RWSTD_WCHAR_T)
+_RWSTD_SPECIALIZE_LIMITS (wchar_t, _RWSTD_WCHAR)
 
 #  endif   // _RWSTD_NO_NATIVE_WCHAR_T
 #endif   // _RWSTD_NO_WCHAR_T
diff --git a/include/limits.c b/include/limits.c
index 9168030..b7f81c3 100644
--- a/include/limits.c
+++ b/include/limits.c
@@ -2,20 +2,27 @@
  *
  * limits.c
  *
- * $Id: //stdlib/dev/include/limits.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/list.c b/include/list.c
index 3283098..ff3abe5 100644
--- a/include/list.c
+++ b/include/list.c
@@ -2,20 +2,27 @@
  *
  * list.c
  *
- * $Id: //stdlib/dev/include/list.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_codecvt.c b/include/loc/_codecvt.c
index 1303153..f3a02e9 100644
--- a/include/loc/_codecvt.c
+++ b/include/loc/_codecvt.c
@@ -2,20 +2,27 @@
  *
  * loc/_codecvt.c
  *
- * $Id: //stdlib/dev/include/loc/_codecvt.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_codecvt.h b/include/loc/_codecvt.h
index 4251a02..e6934b2 100644
--- a/include/loc/_codecvt.h
+++ b/include/loc/_codecvt.h
@@ -25,7 +25,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -186,8 +186,7 @@
     typedef char             intern_type;
     typedef _RWSTD_MBSTATE_T state_type;
 
-    _EXPLICIT codecvt (_RWSTD_SIZE_T __refs = 0)
-        : _RW::__rw_facet (__refs), _C_always_noconv (-1) { }
+    _EXPLICIT codecvt (_RWSTD_SIZE_T = 0);
 
     virtual ~codecvt ();
 
@@ -318,23 +317,16 @@
     virtual result
     do_unshift (state_type&, extern_type*, extern_type*, extern_type*&) const;
 
-    virtual bool do_always_noconv () const _THROWS (()) {
-        return false;   // conversion always necessary
-    }
+    virtual bool do_always_noconv () const _THROWS (());
 
-    virtual int do_encoding () const _THROWS (()) {
-        // 22.2.1.5.2 p6    1(ext.) <=> 1(int.)
-        return 1;   
-    }
+    virtual int do_encoding () const _THROWS (());
 
     // signature follows lwg issue 75
     virtual int
     do_length (state_type&,
                const extern_type*, const extern_type*, _RWSTD_SIZE_T) const;
 
-    virtual int do_max_length () const _THROWS (()) {
-        return 1;
-    }
+    virtual int do_max_length () const _THROWS (());
 
 public:
 
diff --git a/include/loc/_collate.c b/include/loc/_collate.c
index d9ed683..3fb5121 100644
--- a/include/loc/_collate.c
+++ b/include/loc/_collate.c
@@ -2,20 +2,27 @@
  *
  * loc/_collate.c
  *
- * $Id: //stdlib/dev/include/loc/_collate.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_ctype.c b/include/loc/_ctype.c
index 28c0472..3b03760 100644
--- a/include/loc/_ctype.c
+++ b/include/loc/_ctype.c
@@ -2,20 +2,27 @@
  *
  * loc/_ctype.c
  *
- * $Id: //stdlib/dev/include/loc/_ctype.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_ctype.h b/include/loc/_ctype.h
index 0580e5a..3c59845 100644
--- a/include/loc/_ctype.h
+++ b/include/loc/_ctype.h
@@ -421,56 +421,8 @@
 
     typedef wchar_t char_type;
 
-protected:
-    // inline virtual functions defined first to allow compilers to
-    // inline their definitions when being called from nonvirtuals
-
-    virtual ~ctype ();
-
-    // 22.2.1.1.2, p1
-    virtual bool do_is (mask, char_type) const;
-
-    virtual const char_type*
-    do_is (const char_type*, const char_type*, mask*) const;
-
-    // 22.2.1.1.2, p7
-    virtual char_type do_toupper (char_type) const;
-
-    // 22.2.1.1.2, p9
-    virtual char_type do_tolower (char_type) const;
-
-    // 22.2.1.1.2, p11
-    virtual char_type do_widen (char) const;
-
-    virtual const char*
-    do_widen (const char*, const char*, char_type*) const;
-
-    // 22.2.1.1.2, p13
-    virtual char
-    do_narrow (char_type, char) const;
-
-    virtual const char_type*
-    do_toupper (char_type*, const char_type*) const;
-
-    virtual const char_type*
-    do_tolower (char_type*, const char_type*) const;
-
-    // 22.2.1.1.2, p3
-    virtual const char_type*
-    do_scan_is (mask, const char_type*, const char_type*) const;
-
-    // 22.2.1.1.2, p5
-    virtual const char_type*
-    do_scan_not (mask, const char_type*, const char_type*) const;
-
-    virtual const char_type*
-    do_narrow (const char_type*, const char_type*, char, char*) const;
-
-public:
-
     _EXPLICIT ctype (_RWSTD_SIZE_T = 0);
 
-
     // 22.2.1.1.1, p1
     bool is (mask __m, char_type __c) const {
         return do_is ( __m, __c);
@@ -530,6 +482,49 @@
 
     static _RW::__rw_facet_id id;
 
+protected:
+
+    virtual ~ctype ();
+
+    // 22.2.1.1.2, p1
+    virtual bool do_is (mask, char_type) const;
+
+    virtual const char_type*
+    do_is (const char_type*, const char_type*, mask*) const;
+
+    // 22.2.1.1.2, p7
+    virtual char_type do_toupper (char_type) const;
+
+    // 22.2.1.1.2, p9
+    virtual char_type do_tolower (char_type) const;
+
+    // 22.2.1.1.2, p11
+    virtual char_type do_widen (char) const;
+
+    virtual const char*
+    do_widen (const char*, const char*, char_type*) const;
+
+    // 22.2.1.1.2, p13
+    virtual char
+    do_narrow (char_type, char) const;
+
+    virtual const char_type*
+    do_toupper (char_type*, const char_type*) const;
+
+    virtual const char_type*
+    do_tolower (char_type*, const char_type*) const;
+
+    // 22.2.1.1.2, p3
+    virtual const char_type*
+    do_scan_is (mask, const char_type*, const char_type*) const;
+
+    // 22.2.1.1.2, p5
+    virtual const char_type*
+    do_scan_not (mask, const char_type*, const char_type*) const;
+
+    virtual const char_type*
+    do_narrow (const char_type*, const char_type*, char, char*) const;
+
 private:
 
     friend class ctype_byname<wchar_t>;
diff --git a/include/loc/_facet.h b/include/loc/_facet.h
index 0f9d6cc..ff111dc 100644
--- a/include/loc/_facet.h
+++ b/include/loc/_facet.h
@@ -38,20 +38,10 @@
 
 
 _RWSTD_NAMESPACE (std) { 
-}   // namespace std
-
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
-
-#ifndef _MSC_VER
-// make _V3_LOCALE think it's std (if it isn't) to avoid
-// having to qualify all references to standard names with _STD::
-_USING (namespace std);
-
-#endif
 
 struct _RWSTD_CLASS_EXPORT locale;
 
-}   // namespace _V3_LOCALE
+}   // namespace std
 
 
 _RWSTD_NAMESPACE (__rw) { 
@@ -66,10 +56,14 @@
     // of standard types by the library
     typedef __rw_facet* (_C_ctor_t)(_RWSTD_SIZE_T, const char*);
 
+protected:
+
     _EXPLICIT __rw_facet (_RWSTD_SIZE_T = 0);
 
     virtual ~__rw_facet ();
 
+public:
+
     // types of standard facets; only globally managed facets (i.e.,
     // standard facets created internally) set this member, user-created
     // facet objects of any types set their type to _C_unknown
@@ -200,8 +194,6 @@
 
 protected:
 
-    typedef __rw_facet* (*_C_factory_f)(void*);
-
     // set facet locale name (will allocate if bufsize is too small)
     void _C_set_name (const char*, char*, _RWSTD_SIZE_T);
 
@@ -227,7 +219,7 @@
     static __rw_facet*
     _C_manage (__rw_facet*, _C_facet_type, const char*, _C_ctor_t*);
 
-    friend struct _V3_LOCALE::locale;
+    friend struct _STD::locale;
     friend class __rw_locale;
     friend struct __rw_facet_id;
     friend struct __rw_access;
@@ -270,7 +262,7 @@
     _MUTABLE _RWSTD_SIZE_T _C_id;           // unique id > 0
 
     friend class __rw_locale;
-    friend struct _V3_LOCALE::locale;
+    friend struct _STD::locale;
     friend struct __rw_access;
 };
 
diff --git a/include/loc/_localedef.h b/include/loc/_localedef.h
index e265892..c153bfe 100644
--- a/include/loc/_localedef.h
+++ b/include/loc/_localedef.h
@@ -6,23 +6,24 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
+ *
  **************************************************************************/
 
 #ifndef _RWSTD_LOC_LOCALEDEF_H_INCLUDED
@@ -88,7 +89,7 @@
     _RWSTD_UINT32_T codecvt_ext_off;
 
     // the size of the longest multibyte character
-    unsigned char mb_cur_max;
+    _RWSTD_UINT8_T mb_cur_max;
 
     // the name of the codeset and its database file
     const char* codeset_name () const {
@@ -150,10 +151,10 @@
     // this is added to allow for future extensions
     _RWSTD_UINT32_T ctype_ext_off;      // extended ctype data offset
 
-    unsigned char toupper_tab[256];   // the narrow char to_upper table
-    unsigned char tolower_tab[256];   // the narrow char to_lower table
-    _RWSTD_UINT32_T  mask_tab[256];      // the narrow char mask table
-    unsigned char mb_cur_max;         // max number of bytes per MB character
+    _RWSTD_UINT8_T  toupper_tab[256];   // the narrow char to_upper table
+    _RWSTD_UINT8_T  tolower_tab[256];   // the narrow char to_lower table
+    _RWSTD_UINT32_T mask_tab[256];      // the narrow char mask table
+    _RWSTD_UINT8_T  mb_cur_max;         // max number of bytes per MB character
 
     _RWSTD_SIZE_T wtoupper_s () const {
         return (wtolower_off - wtoupper_off) / sizeof (__rw_upper_elm);
@@ -236,11 +237,11 @@
 
     _RWSTD_UINT32_T undefined_optimization;
 
-    unsigned char longest_weight;    // the longest weight value
-    unsigned char num_weights;       // number of weights
-    unsigned char largest_ce;
+    _RWSTD_UINT8_T longest_weight;    // the longest weight value
+    _RWSTD_UINT8_T num_weights;       // number of weights
+    _RWSTD_UINT8_T largest_ce;
 
-    unsigned char weight_type[256];  // weight types (ex. forward)
+    _RWSTD_UINT8_T weight_type[256];  // weight types (ex. forward)
 
     // get the offset of a table number `tabno'
     _RWSTD_UINT32_T get_n_tab_off (_RWSTD_UINT32_T tabno) const {
@@ -266,29 +267,29 @@
                             + (tabno * sizeof (_RWSTD_UINT32_T))))));
     }
 
-    unsigned char get_first_char_in_n_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_n_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + n_char_first_char_off + tabno);
         
     }
 
-    unsigned char get_first_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + n_ce_first_char_off + tabno);
     }
 
-    unsigned char get_first_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + w_ce_first_char_off + tabno);
     }
 
-    unsigned char get_last_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_last_char_in_n_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + n_ce_last_char_off  + tabno);
     }
 
-    unsigned char get_last_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_last_char_in_w_ce_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + w_ce_last_char_off + tabno);
     }
 
@@ -318,8 +319,8 @@
                             + (tabno * sizeof (_RWSTD_UINT32_T))))));
     }
 
-    unsigned char get_first_char_in_w_tab (_RWSTD_UINT32_T tabno) const {
-        return *((const unsigned char*)this + sizeof *this 
+    _RWSTD_UINT8_T get_first_char_in_w_tab (_RWSTD_UINT32_T tabno) const {
+        return *((const _RWSTD_UINT8_T*)this + sizeof *this 
                  + w_char_first_char_off + tabno);
         
     }
@@ -682,7 +683,7 @@
 static inline _RWSTD_SIZE_T
 __rw_itoutf8 (_RWSTD_UINT32_T wchar, char *to)
 {
-    typedef unsigned char _UChar;
+    typedef _RWSTD_UINT8_T _UChar;
 
     if (wchar < 0x80U) {
         to [0] = _UChar (wchar);
@@ -739,8 +740,8 @@
 
     typedef _RWSTD_INT32_T _Int32;
 
-    const unsigned char* const byte =
-        _RWSTD_REINTERPRET_CAST (const unsigned char*, from);
+    const _RWSTD_UINT8_T* const byte =
+        _RWSTD_REINTERPRET_CAST (const _RWSTD_UINT8_T*, from);
 
     if (byte [0] < 0x80U) {
         *ret = _Int32 (byte [0]);
@@ -823,7 +824,7 @@
                        const char     *&from,
                        const char     *from_end)
 {
-    typedef unsigned char _UChar;
+    typedef _RWSTD_UINT8_T _UChar;
 
     // `bit31' has the most significant bit set and all others clear
     const unsigned bit31 = 0x80000000U;
diff --git a/include/loc/_messages.c b/include/loc/_messages.c
index 6b6ff99..928df2f 100644
--- a/include/loc/_messages.c
+++ b/include/loc/_messages.c
@@ -2,20 +2,27 @@
  *
  * loc/_messages.c
  *
- * $Id: //stdlib/dev/include/loc/_messages.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_messages.cc b/include/loc/_messages.cc
index a3757ab..6bb49f4 100644
--- a/include/loc/_messages.cc
+++ b/include/loc/_messages.cc
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -34,6 +35,25 @@
 template <class _CharT>
 _RW::__rw_facet_id messages<_CharT>::id;
 
+
+template <class _CharT>
+messages_base::catalog
+messages<_CharT>::
+do_open (const string& __fun, const locale&__loc) const
+{
+    return _RW::__rw_cat_open (__fun, __loc);
+}
+
+
+template <class _CharT>
+void
+messages<_CharT>::
+do_close (messages_base::catalog __cat) const
+{
+    _RW::__rw_cat_close (__cat);
+}
+
+
 template <class _CharT>
 _TYPENAME messages<_CharT>::string_type
 messages<_CharT>::do_get (messages_base::catalog __cat,
diff --git a/include/loc/_messages.h b/include/loc/_messages.h
index b051920..341c6c1 100644
--- a/include/loc/_messages.h
+++ b/include/loc/_messages.h
@@ -25,7 +25,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -82,7 +82,7 @@
                          allocator<char_type> > string_type;
 
     _EXPLICIT messages (_RWSTD_SIZE_T __refs = 0)
-        : _RW::__rw_facet (__refs), messages_base () { }
+        : _RW::__rw_facet (__refs) { }
 
 
     catalog open (const string& __fun, const locale& __loc) const {
@@ -102,15 +102,11 @@
 
 protected:
 
-    virtual catalog do_open (const string& __fun, const locale&__loc) const {
-        return _RW::__rw_cat_open (__fun, __loc);
-    }
+    virtual catalog do_open (const string&, const locale&) const;
 
     virtual string_type do_get (catalog, int, int, const string_type&) const;
 
-    virtual void do_close (catalog __cat) const { 
-	_RW::__rw_cat_close (__cat);
-    }
+    virtual void do_close (catalog) const;
 };
 
 
diff --git a/include/loc/_money_get.c b/include/loc/_money_get.c
index ed5d41e..645a63f 100644
--- a/include/loc/_money_get.c
+++ b/include/loc/_money_get.c
@@ -2,20 +2,27 @@
  *
  * loc/_money_get.c
  *
- * $Id: //stdlib/dev/include/loc/_money_get.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_money_get.cc b/include/loc/_money_get.cc
index bff4dc1..77f8812 100644
--- a/include/loc/_money_get.cc
+++ b/include/loc/_money_get.cc
@@ -165,7 +165,10 @@
         case /* '\3' */ money_base::sign: {
 
             if (__it == __end) {
-                __ebits |= _RW::__rw_failbit;
+                if (__ps.size () && __ns.size ())
+                    __ebits |= _RW::__rw_failbit;
+                else
+                    __sign = __ps.empty () - 1;
                 break;
             }
 
diff --git a/include/loc/_money_put.c b/include/loc/_money_put.c
index e835063..b263a1b 100644
--- a/include/loc/_money_put.c
+++ b/include/loc/_money_put.c
@@ -2,20 +2,27 @@
  *
  * loc/_money_put.c
  *
- * $Id: //stdlib/dev/include/loc/_money_put.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_moneypunct.c b/include/loc/_moneypunct.c
index 0f70960..764d2dd 100644
--- a/include/loc/_moneypunct.c
+++ b/include/loc/_moneypunct.c
@@ -2,20 +2,27 @@
  *
  * loc/_moneypunct.c
  *
- * $Id: //stdlib/dev/include/loc/_moneypunct.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_moneypunct.h b/include/loc/_moneypunct.h
index 980a43d..8a30274 100644
--- a/include/loc/_moneypunct.h
+++ b/include/loc/_moneypunct.h
@@ -66,7 +66,7 @@
     string_type;
 
     _EXPLICIT moneypunct (_RWSTD_SIZE_T __refs = 0)
-        : _RW::__rw_facet (__refs), money_base () { }
+        : _RW::__rw_facet (__refs) { }
 
     char_type decimal_point () const {
         return do_decimal_point ();
diff --git a/include/loc/_num_get.c b/include/loc/_num_get.c
index cf841d2..47cace2 100644
--- a/include/loc/_num_get.c
+++ b/include/loc/_num_get.c
@@ -2,20 +2,27 @@
  *
  * loc/_num_get.c
  *
- * $Id: //stdlib/dev/include/loc/_num_get.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_num_put.c b/include/loc/_num_put.c
index a17d168..39230e2 100644
--- a/include/loc/_num_put.c
+++ b/include/loc/_num_put.c
@@ -2,20 +2,27 @@
  *
  * loc/_num_put.c
  *
- * $Id: //stdlib/dev/include/loc/_num_put.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_numpunct.c b/include/loc/_numpunct.c
index 738983a..e87d842 100644
--- a/include/loc/_numpunct.c
+++ b/include/loc/_numpunct.c
@@ -2,20 +2,27 @@
  *
  * loc/_numpunct.c
  *
- * $Id: //stdlib/dev/include/loc/_numpunct.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_punct.c b/include/loc/_punct.c
index d4908ac..74661c6 100644
--- a/include/loc/_punct.c
+++ b/include/loc/_punct.c
@@ -2,20 +2,27 @@
  *
  * loc/_punct.c
  *
- * $Id: //stdlib/dev/include/loc/_punct.c#6 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_time_get.c b/include/loc/_time_get.c
index 0d8e516..77587fa 100644
--- a/include/loc/_time_get.c
+++ b/include/loc/_time_get.c
@@ -2,20 +2,27 @@
  *
  * loc/_time_get.c
  *
- * $Id: //stdlib/dev/include/loc/_time_get.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/loc/_time_put.c b/include/loc/_time_put.c
index 2e5f446..5f62112 100644
--- a/include/loc/_time_put.c
+++ b/include/loc/_time_put.c
@@ -2,20 +2,27 @@
  *
  * loc/_time_put.c
  *
- * $Id: //stdlib/dev/include/loc/_time_put.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/ostream.c b/include/ostream.c
index 8f9d7d0..a0b672b 100644
--- a/include/ostream.c
+++ b/include/ostream.c
@@ -2,20 +2,27 @@
  *
  * ostream.c
  *
- * $Id: //stdlib/dev/include/ostream.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_algobase.c b/include/rw/_algobase.c
index 1a269f8..cfc40af 100644
--- a/include/rw/_algobase.c
+++ b/include/rw/_algobase.c
@@ -2,20 +2,27 @@
  *
  * rw/_algobase.c
  *
- * $Id: //stdlib/dev/include/rw/_algobase.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_basic_ios.c b/include/rw/_basic_ios.c
index 890a59d..e3fd75b 100644
--- a/include/rw/_basic_ios.c
+++ b/include/rw/_basic_ios.c
@@ -2,20 +2,27 @@
  *
  * rw/_basic_ios.c
  *
- * $Id: //stdlib/dev/include/rw/_basic_ios.c#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_config-icc.h b/include/rw/_config-icc.h
index 495c101..c05372e 100644
--- a/include/rw/_config-icc.h
+++ b/include/rw/_config-icc.h
@@ -54,7 +54,7 @@
 #  endif   // _RWSHARED
 
 // disable "function was declared "deprecated"
-#  pragma warning (disable: 1478)
+#  pragma warning (disable: 1786)
 
 // disable "dllexport/dllimport conflict with ... ; dllexport assumed"
 #  pragma warning (disable: 1740)
diff --git a/include/rw/_defs.h b/include/rw/_defs.h
index c4caa2e..b6e729a 100644
--- a/include/rw/_defs.h
+++ b/include/rw/_defs.h
@@ -91,7 +91,7 @@
 
 #else   // if defined (_RWSTD_NO_NEW_HEADER)
 
-#  define _RWSTD_CASSERT   <assert.h>
+#  define _RWSTD_CASSERT   "assert.h"
 #  define _RWSTD_CCTYPE    <ctype.h>
 #  define _RWSTD_CERRNO    "errno.h"
 #  define _RWSTD_CFLOAT    <float.h>
@@ -99,7 +99,7 @@
 #  define _RWSTD_CLIMITS   <limits.h>
 #  define _RWSTD_CLOCALE   <locale.h>
 #  define _RWSTD_CMATH     <math.h>
-#  define _RWSTD_CSETJMP   <setjmp.h>
+#  define _RWSTD_CSETJMP   "setjmp.h"
 #  define _RWSTD_CSIGNAL   <signal.h>
 #  define _RWSTD_CSTDARG   <stdarg.h>
 #  define _RWSTD_CSTDDEF   <stddef.h>
@@ -135,7 +135,9 @@
 #if defined (_M_IA64)
    // IA64/Itanium SDK paths
 #  if !defined (_RWSTD_NO_ASSERT_H) && !defined (_RWSTD_ANSI_C_ASSERT_H)
-#    define _RWSTD_ANSI_C_ASSERT_H <../include/crt/assert.h>
+     // pathname quoted in order to prevent the assert macro
+     // from expanding in the include directive
+#    define _RWSTD_ANSI_C_ASSERT_H "../include/crt/assert.h"
 #  endif
 #  if !defined (_RWSTD_NO_CTYPE_H) && !defined (_RWSTD_ANSI_C_CTYPE_H)
 #    define _RWSTD_ANSI_C_CTYPE_H <../include/crt/ctype.h>
@@ -167,7 +169,9 @@
 #    define _RWSTD_ANSI_C_MATH_H <../include/crt/math.h>
 #  endif
 #  if !defined (_RWSTD_NO_SETJMP_H) && !defined (_RWSTD_ANSI_C_SETJMP_H)
-#    define _RWSTD_ANSI_C_SETJMP_H <../include/crt/setjmp.h>
+     // pathname quoted in order to prevent the setjmp macro
+     // from expanding in the include directive
+#    define _RWSTD_ANSI_C_SETJMP_H "../include/crt/setjmp.h"
 #  endif
 #  if !defined (_RWSTD_NO_SIGNAL_H) && !defined (_RWSTD_ANSI_C_SIGNAL_H)
 #    define _RWSTD_ANSI_C_SIGNAL_H <../include/crt/signal.h>
@@ -205,7 +209,9 @@
 #elif !defined (_RWSTD_NO_FORCE_RELATIVE_PATHS)
 
 #  undef _RWSTD_ANSI_C_ASSERT_H
-#  define _RWSTD_ANSI_C_ASSERT_H <../include/assert.h>
+   // pathname quoted in order to prevent the assert macro
+   // from expanding in the include directive
+#  define _RWSTD_ANSI_C_ASSERT_H "../include/assert.h"
 #  undef _RWSTD_ANSI_C_CTYPE_H
 #  define _RWSTD_ANSI_C_CTYPE_H <../include/ctype.h>
 #  undef _RWSTD_ANSI_C_ERRNO_H
@@ -229,7 +235,9 @@
 #  undef _RWSTD_ANSI_C_MATH_H
 #  define _RWSTD_ANSI_C_MATH_H <../include/math.h>
 #  undef _RWSTD_ANSI_C_SETJMP_H
-#  define _RWSTD_ANSI_C_SETJMP_H <../include/setjmp.h>
+   // pathname quoted in order to prevent the setjmp macro
+   // from expanding in the include directive
+#  define _RWSTD_ANSI_C_SETJMP_H "../include/setjmp.h"
 #  undef _RWSTD_ANSI_C_SIGNAL_H
 #  define _RWSTD_ANSI_C_SIGNAL_H <../include/signal.h>
 #  undef _RWSTD_ANSI_C_STDARG_H
@@ -262,7 +270,9 @@
 #elif defined (_RWSTD_USE_USR_INCLUDE_HEADERS)
 
 #  if !defined (_RWSTD_NO_ASSERT_H) && !defined (_RWSTD_ANSI_C_ASSERT_H)
-#    define _RWSTD_ANSI_C_ASSERT_H </usr/include/assert.h>
+     // pathname quoted in order to prevent the assert macro
+     // from expanding in the include directive
+#    define _RWSTD_ANSI_C_ASSERT_H "/usr/include/assert.h"
 #  endif
 #  if !defined (_RWSTD_NO_CTYPE_H) && !defined (_RWSTD_ANSI_C_CTYPE_H)
 #    define _RWSTD_ANSI_C_CTYPE_H </usr/include/ctype.h>
@@ -294,7 +304,9 @@
 #    define _RWSTD_ANSI_C_MATH_H </usr/include/math.h>
 #  endif
 #  if !defined (_RWSTD_NO_SETJMP_H) && !defined (_RWSTD_ANSI_C_SETJMP_H)
-#    define _RWSTD_ANSI_C_SETJMP_H </usr/include/setjmp.h>
+     // pathname quoted in order to prevent the setjmp macro
+     // from expanding in the include directive
+#    define _RWSTD_ANSI_C_SETJMP_H "/usr/include/setjmp.h"
 #  endif
 #  if !defined (_RWSTD_NO_SIGNAL_H) && !defined (_RWSTD_ANSI_C_SIGNAL_H)
 #    define _RWSTD_ANSI_C_SIGNAL_H </usr/include/signal.h>
@@ -332,7 +344,9 @@
 #else   // if !_WIN64 && !_RWSTD_USE_USR_INCLUDE_HEADERS
 
 #  if !defined (_RWSTD_NO_ASSERT_H) && !defined (_RWSTD_ANSI_C_ASSERT_H)
-#    define _RWSTD_ANSI_C_ASSERT_H <../include/assert.h>
+     // pathname quoted in order to prevent the assert macro
+     // from expanding in the include directive
+#    define _RWSTD_ANSI_C_ASSERT_H "../include/assert.h"
 #  endif
 #  if !defined (_RWSTD_NO_CTYPE_H) && !defined (_RWSTD_ANSI_C_CTYPE_H)
 #    define _RWSTD_ANSI_C_CTYPE_H <../include/ctype.h>
@@ -364,7 +378,9 @@
 #    define _RWSTD_ANSI_C_MATH_H <../include/math.h>
 #  endif
 #  if !defined (_RWSTD_NO_SETJMP_H) && !defined (_RWSTD_ANSI_C_SETJMP_H)
-#    define _RWSTD_ANSI_C_SETJMP_H <../include/setjmp.h>
+     // pathname quoted in order to prevent the setjmp macro
+     // from expanding in the include directive
+#    define _RWSTD_ANSI_C_SETJMP_H "../include/setjmp.h"
 #  endif
 #  if !defined (_RWSTD_NO_SIGNAL_H) && !defined (_RWSTD_ANSI_C_SIGNAL_H)
 #    define _RWSTD_ANSI_C_SIGNAL_H <../include/signal.h>
diff --git a/include/rw/_heap.c b/include/rw/_heap.c
index 97f9300..d89dfaf 100644
--- a/include/rw/_heap.c
+++ b/include/rw/_heap.c
@@ -2,20 +2,27 @@
  *
  * rw/_heap.c
  *
- * $Id: //stdlib/dev/include/rw/_heap.c#2 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_ioinsert.c b/include/rw/_ioinsert.c
index 91a17ec..b56f2ea 100644
--- a/include/rw/_ioinsert.c
+++ b/include/rw/_ioinsert.c
@@ -2,20 +2,27 @@
  *
  * rw/_ioinsert.c
  *
- * $Id: //stdlib/dev/include/rw/_ioinsert.c#4 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/rw/_iterbase.h b/include/rw/_iterbase.h
index e8b8b24..0109c67 100644
--- a/include/rw/_iterbase.h
+++ b/include/rw/_iterbase.h
@@ -22,22 +22,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 1994-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -337,7 +338,7 @@
 // 24.3.4, p4
 template <class _ForwardIterator>
 inline _TYPENAME iterator_traits<_ForwardIterator>::difference_type
-distance (const _ForwardIterator &__first, const _ForwardIterator &__last)
+distance (_ForwardIterator __first, _ForwardIterator __last)
 {
     _TYPENAME iterator_traits<_ForwardIterator>::difference_type __n = 0;
 
diff --git a/include/rw/_mutex.h b/include/rw/_mutex.h
index dc0d2e3..1701b18 100644
--- a/include/rw/_mutex.h
+++ b/include/rw/_mutex.h
@@ -140,6 +140,9 @@
 __declspec (dllimport) void __stdcall
 DeleteCriticalSection (_RTL_CRITICAL_SECTION*);
 
+
+#if defined _RWSTD_INTERLOCKED_T && (!defined (_MSC_VER) || _MSC_VER < 1400)
+
 __declspec (dllimport) long __stdcall
 InterlockedIncrement (_RWSTD_INTERLOCKED_T*);
 
@@ -149,6 +152,12 @@
 __declspec (dllimport) long __stdcall
 InterlockedExchange (_RWSTD_INTERLOCKED_T*, long);
 
+#  define _InterlockedIncrement InterlockedIncrement
+#  define _InterlockedDecrement InterlockedDecrement
+#  define _InterlockedExchange  InterlockedExchange
+
+#endif   // _RWSTD_INTERLOCKED_T && (!_MSC_VER || _MSC_VER < 1400)
+
 }   // extern "C"
 
 _RWSTD_NAMESPACE (__rw) { 
@@ -166,6 +175,21 @@
 
 #  endif   // _RWSTD_NO_FWD_DECLARATIONS
 
+#  if defined (_MSC_VER) && _MSC_VER >= 1400 && !defined (__INTEL_COMPILER)
+#    include <intrin.h>
+
+#    pragma intrinsic (_InterlockedIncrement)
+#    pragma intrinsic (_InterlockedIncrement16)
+#    pragma intrinsic (_InterlockedDecrement)
+#    pragma intrinsic (_InterlockedDecrement16)
+#    pragma intrinsic (_InterlockedExchange)
+
+#    ifdef _M_X64
+#      pragma intrinsic (_InterlockedIncrement64)
+#      pragma intrinsic (_InterlockedDecrement64)
+#      pragma intrinsic (_InterlockedExchange64)
+#    endif
+#  endif   // _MSC_VER >= 1400 && !__INTEL_COMPILER
 
 
 _RWSTD_NAMESPACE (__rw) { 
@@ -480,9 +504,9 @@
     // up with multiple copies)
     static volatile long __cntr /* = 0 */;   // initialization counter
 
-#if defined (_WIN32) || defined (_WIN64)
+#if defined (_WIN32)
     // MT safe
-    if (0 == __cntr && 1 == InterlockedIncrement ((long*)&__cntr))
+    if (0 == __cntr && 1 == _InterlockedIncrement ((long*)&__cntr))
 #else
     // not so safe (volatile should help)
     if (0 == __cntr && 1 == ++__cntr)
@@ -1161,19 +1185,20 @@
                                         false);
 } 
 
-/********************** i386/gcc **************************************/
+/********************** i386/gcc || _M_IX86 *********************************/
 
-#elif defined (__i386__) && (defined (__GNUG__) || defined (__INTEL_COMPILER))
+#elif defined (__i386__) && (defined (__GNUG__) \
+   || defined (__INTEL_COMPILER)) || defined (_M_IX86)
 
 extern "C" {
 
-char __rw_atomic_add8 (char*, int);
-short __rw_atomic_add16 (short*, short);
-int __rw_atomic_add32 (int*, int);
+_RWSTD_EXPORT char __rw_atomic_add8 (char*, int);
+_RWSTD_EXPORT short __rw_atomic_add16 (short*, short);
+_RWSTD_EXPORT int __rw_atomic_add32 (int*, int);
 
-char __rw_atomic_xchg8 (char*, char);
-short __rw_atomic_xchg16 (short*, short);
-int __rw_atomic_xchg32 (int*, int);
+_RWSTD_EXPORT char __rw_atomic_xchg8 (char*, char);
+_RWSTD_EXPORT short __rw_atomic_xchg16 (short*, short);
+_RWSTD_EXPORT int __rw_atomic_xchg32 (int*, int);
 
 }   // extern "C"
 
@@ -1206,7 +1231,12 @@
 __rw_atomic_preincrement (short &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (short));
+
+#if defined (_MSC_VER) && _MSC_VER >= 1400 && !defined (__INTEL_COMPILER)
+    return _InterlockedIncrement16 (&__x);
+#else
     return __rw_atomic_add16 (&__x, +1);
+#endif
 }
 
 
@@ -1214,7 +1244,12 @@
 __rw_atomic_preincrement (unsigned short &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (unsigned short));
+
+#if defined (_MSC_VER) && _MSC_VER >= 1400 && !defined (__INTEL_COMPILER)
+    return _InterlockedIncrement16 (_RWSTD_REINTERPRET_CAST (short*, &__x));
+#else
     return __rw_atomic_add16 (_RWSTD_REINTERPRET_CAST (short*, &__x), +1);
+#endif
 }
 
 
@@ -1222,7 +1257,12 @@
 __rw_atomic_preincrement (int &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (int));
+
+#ifdef _MSC_VER
+    return _InterlockedIncrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (&__x, 1);
+#endif
 }
 
 
@@ -1230,7 +1270,12 @@
 __rw_atomic_preincrement (unsigned int &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (unsigned int));
+
+#ifdef _MSC_VER
+    return _InterlockedIncrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (_RWSTD_REINTERPRET_CAST (int*, &__x), 1);
+#endif
 }
 
 
@@ -1262,7 +1307,12 @@
 __rw_atomic_predecrement (short &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (short));
+
+#if defined (_MSC_VER) && _MSC_VER >= 1400 && !defined (__INTEL_COMPILER)
+    return _InterlockedDecrement16 (&__x);
+#else
     return __rw_atomic_add16 (&__x, -1);
+#endif
 }
 
 
@@ -1270,7 +1320,12 @@
 __rw_atomic_predecrement (unsigned short &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (unsigned short));
+
+#if defined (_MSC_VER) && _MSC_VER >= 1400 && !defined (__INTEL_COMPILER)
+    return _InterlockedDecrement16 (_RWSTD_REINTERPRET_CAST (short*, &__x));
+#else
     return __rw_atomic_add16 (_RWSTD_REINTERPRET_CAST (short*, &__x), -1);
+#endif
 }
 
 
@@ -1278,7 +1333,12 @@
 __rw_atomic_predecrement (int &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (int));
+
+#ifdef _MSC_VER
+    return _InterlockedDecrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (&__x, -1);
+#endif
 }
 
 
@@ -1286,7 +1346,12 @@
 __rw_atomic_predecrement (unsigned int &__x, bool)
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (unsigned int));
+
+#ifdef _MSC_VER
+    return _InterlockedDecrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (_RWSTD_REINTERPRET_CAST (int*, &__x), -1);
+#endif
 }
 
 
@@ -1337,7 +1402,13 @@
 __rw_atomic_exchange (int &__x, int __y, bool)
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (int));
+
+#ifdef _MSC_VER
+    return _InterlockedExchange (_RWSTD_REINTERPRET_CAST (long*, &__x),
+                                 _RWSTD_STATIC_CAST (long, __y));
+#else
     return __rw_atomic_xchg32 (&__x, __y);
+#endif
 }
 
 
@@ -1345,88 +1416,48 @@
 __rw_atomic_exchange (unsigned int &__x, unsigned int __y, bool)
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (unsigned int));
+
+#ifdef _MSC_VER
+    return _InterlockedExchange (_RWSTD_REINTERPRET_CAST (long*, &__x),
+                                 _RWSTD_STATIC_CAST (long, __y));
+#else
     return __rw_atomic_xchg32 (_RWSTD_REINTERPRET_CAST (int*, &__x),
                                _RWSTD_STATIC_CAST (int, __y));
+#endif
 }
 
+/********************** IA64/x86_64/_M_X64 *****************************/
 
-/********************** WIN 32/64 ************************************/
-
-#elif defined (_WIN32)
-
-// Interlocked[In|De]crement functions atomically modify their argument
-// and return the new value
-
-// InterlockedExchange atomically sets the value pointed to by the first
-// argument to that of the second argument and returns the original value
-
-inline int
-__rw_atomic_preincrement (int &__x, bool)
-{
-    _RWSTD_COMPILE_ASSERT (sizeof __x == sizeof (long));
-    return InterlockedIncrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
-}
-
-
-inline unsigned int
-__rw_atomic_preincrement (unsigned int &__x, bool)
-{
-    return __rw_atomic_preincrement (_RWSTD_REINTERPRET_CAST (long&, __x),
-                                     false);
-}
-
-
-inline int
-__rw_atomic_predecrement (int &__x, bool)
-{
-    _RWSTD_COMPILE_ASSERT (sizeof __x == sizeof (long));
-    return InterlockedDecrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
-}
-
-
-inline unsigned int
-__rw_atomic_predecrement (unsigned int &__x, bool)
-{
-    return __rw_atomic_predecrement (_RWSTD_REINTERPRET_CAST (int&, __x),
-                                     false);
-}
-
-
-inline int
-__rw_atomic_exchange (int &__x, int __y, bool)
-{
-    _RWSTD_COMPILE_ASSERT (sizeof __x == sizeof (long));
-    return InterlockedExchange (_RWSTD_REINTERPRET_CAST (long*, &__x),
-                                _RWSTD_STATIC_CAST (long, __y));
-}
-
-
-inline unsigned int
-__rw_atomic_exchange (unsigned int &__x, unsigned int __y, bool)
-{
-    return __rw_atomic_exchange (_RWSTD_REINTERPRET_CAST (int&, __x),
-                                 _RWSTD_STATIC_CAST (int, __y), false);
-}
-
-/********************** IA64/x86_64 ***********************************/
-
-#elif defined (__ia64) || defined (__x86_64)
+#elif defined (__ia64) || defined (__x86_64) || defined (_M_X64)
 
 extern "C" {
 
-_RWSTD_INT8_T  __rw_atomic_xchg8  (_RWSTD_INT8_T*,  _RWSTD_INT8_T);
-_RWSTD_INT16_T __rw_atomic_xchg16 (_RWSTD_INT16_T*, _RWSTD_INT16_T);
-_RWSTD_INT32_T __rw_atomic_xchg32 (_RWSTD_INT32_T*, _RWSTD_INT32_T);
+_RWSTD_EXPORT _RWSTD_INT8_T
+__rw_atomic_xchg8  (_RWSTD_INT8_T*,  _RWSTD_INT8_T);
+
+_RWSTD_EXPORT _RWSTD_INT16_T
+__rw_atomic_xchg16 (_RWSTD_INT16_T*, _RWSTD_INT16_T);
+
+_RWSTD_EXPORT _RWSTD_INT32_T
+__rw_atomic_xchg32 (_RWSTD_INT32_T*, _RWSTD_INT32_T);
 
 
-_RWSTD_INT8_T  __rw_atomic_add8  (_RWSTD_INT8_T*,  _RWSTD_INT8_T);
-_RWSTD_INT16_T __rw_atomic_add16 (_RWSTD_INT16_T*, _RWSTD_INT16_T);
-_RWSTD_INT32_T __rw_atomic_add32 (_RWSTD_INT32_T*, _RWSTD_INT32_T);
+_RWSTD_EXPORT _RWSTD_INT8_T
+__rw_atomic_add8  (_RWSTD_INT8_T*,  _RWSTD_INT8_T);
+
+_RWSTD_EXPORT _RWSTD_INT16_T
+__rw_atomic_add16 (_RWSTD_INT16_T*, _RWSTD_INT16_T);
+
+_RWSTD_EXPORT _RWSTD_INT32_T
+__rw_atomic_add32 (_RWSTD_INT32_T*, _RWSTD_INT32_T);
 
 #ifdef _RWSTD_INT64_T
 
-_RWSTD_INT64_T __rw_atomic_xchg64 (_RWSTD_INT64_T*, _RWSTD_INT64_T);
-_RWSTD_INT64_T __rw_atomic_add64 (_RWSTD_INT64_T*, _RWSTD_INT64_T);
+_RWSTD_EXPORT _RWSTD_INT64_T
+__rw_atomic_xchg64 (_RWSTD_INT64_T*, _RWSTD_INT64_T);
+
+_RWSTD_EXPORT _RWSTD_INT64_T
+__rw_atomic_add64 (_RWSTD_INT64_T*, _RWSTD_INT64_T);
 
 #endif   // _RWSTD_INT64_T
 
@@ -1468,8 +1499,12 @@
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (short));
 
+#if defined (_MSC_VER) && !defined (__INTEL_COMPILER)
+    return _InterlockedIncrement16 (&__x);
+#else
     return __rw_atomic_add16 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT16_T*, &__x),
                               +1);
+#endif
 }
 
 
@@ -1478,8 +1513,12 @@
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (unsigned short));
 
+#if defined (_MSC_VER) && !defined (__INTEL_COMPILER)
+    return _InterlockedIncrement16 (_RWSTD_REINTERPRET_CAST (short*, &__x));
+#else
     return __rw_atomic_add16 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT16_T*, &__x),
                               +1);
+#endif
 }
 
 
@@ -1488,8 +1527,12 @@
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (int));
 
+#ifdef _MSC_VER
+    return _InterlockedIncrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT32_T*, &__x),
                               +1);
+#endif
 }
 
 
@@ -1498,8 +1541,12 @@
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (unsigned int));
 
+#ifdef _MSC_VER
+    return _InterlockedIncrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT32_T*, &__x),
                               +1);
+#endif
 }
 
 
@@ -1527,6 +1574,40 @@
 #endif   // _RWSTD_LONG_SIZE
 
 
+#ifdef _RWSTD_LONG_LONG
+#  if _RWSTD_LLONG_SIZE > _RWSTD_LONG_SIZE
+
+inline _RWSTD_LONG_LONG
+__rw_atomic_preincrement (_RWSTD_LONG_LONG &__x, bool)
+{
+    _RWSTD_COMPILE_ASSERT (8 == sizeof (_RWSTD_LONG_LONG));
+
+#ifdef _MSC_VER
+    return _InterlockedIncrement64 (_RWSTD_REINTERPRET_CAST (__int64*, &__x));
+#else
+    return __rw_atomic_add64 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT64_T*, &__x),
+                              +1);
+#endif
+}
+
+
+inline unsigned _RWSTD_LONG_LONG
+__rw_atomic_preincrement (unsigned _RWSTD_LONG_LONG &__x, bool)
+{
+    _RWSTD_COMPILE_ASSERT (8 == sizeof (unsigned _RWSTD_LONG_LONG));
+
+#ifdef _MSC_VER
+    return _InterlockedIncrement64 (_RWSTD_REINTERPRET_CAST (__int64*, &__x));
+#else
+    return __rw_atomic_add64 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT64_T*, &__x),
+                              +1);
+#endif
+}
+
+#  endif   // _RWSTD_LLONG_SIZE > _RWSTD_LONG_SIZE
+#endif   // _RWSTD_LONG_LONG
+
+
 inline char
 __rw_atomic_predecrement (char &__x, bool)
 {
@@ -1562,8 +1643,12 @@
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (short));
 
+#if defined (_MSC_VER) && !defined (__INTEL_COMPILER)
+    return _InterlockedDecrement16 (&__x);
+#else
     return __rw_atomic_add16 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT16_T*, &__x),
                               -1);
+#endif
 }
 
 
@@ -1572,8 +1657,12 @@
 {
     _RWSTD_COMPILE_ASSERT (2 == sizeof (unsigned short));
 
+#if defined (_MSC_VER) && !defined (__INTEL_COMPILER)
+    return _InterlockedDecrement16 (_RWSTD_REINTERPRET_CAST (short*, &__x));
+#else
     return __rw_atomic_add16 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT16_T*, &__x),
                               -1);
+#endif
 }
 
 
@@ -1582,8 +1671,12 @@
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (int));
 
+#ifdef _MSC_VER
+    return _InterlockedDecrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT32_T*, &__x),
                               -1);
+#endif
 }
 
 
@@ -1592,8 +1685,12 @@
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (unsigned int));
 
+#ifdef _MSC_VER
+    return _InterlockedDecrement (_RWSTD_REINTERPRET_CAST (long*, &__x));
+#else
     return __rw_atomic_add32 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT32_T*, &__x),
                               -1);
+#endif
 }
 
 
@@ -1612,7 +1709,7 @@
 inline unsigned long
 __rw_atomic_predecrement (unsigned long &__x, bool)
 {
-    _RWSTD_COMPILE_ASSERT (8 == sizeof (long));
+    _RWSTD_COMPILE_ASSERT (8 == sizeof (unsigned long));
 
     return __rw_atomic_add64 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT64_T*, &__x),
                               -1);
@@ -1621,6 +1718,40 @@
 #endif   // _RWSTD_LONG_SIZE
 
 
+#ifdef _RWSTD_LONG_LONG
+#  if _RWSTD_LLONG_SIZE > _RWSTD_LONG_SIZE
+
+inline _RWSTD_LONG_LONG
+__rw_atomic_predecrement (_RWSTD_LONG_LONG &__x, bool)
+{
+    _RWSTD_COMPILE_ASSERT (8 == sizeof (_RWSTD_LONG_LONG));
+
+#ifdef _MSC_VER
+    return _InterlockedDecrement64 (_RWSTD_REINTERPRET_CAST (__int64*, &__x));
+#else
+    return __rw_atomic_add64 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT64_T*, &__x),
+                              -1);
+#endif
+}
+
+
+inline unsigned _RWSTD_LONG_LONG
+__rw_atomic_predecrement (unsigned _RWSTD_LONG_LONG &__x, bool)
+{
+    _RWSTD_COMPILE_ASSERT (8 == sizeof (unsigned _RWSTD_LONG_LONG));
+
+#ifdef _MSC_VER
+    return _InterlockedDecrement64 (_RWSTD_REINTERPRET_CAST (__int64*, &__x));
+#else
+    return __rw_atomic_add64 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT64_T*, &__x),
+                              -1);
+#endif
+}
+
+#  endif   // _RWSTD_LLONG_SIZE > _RWSTD_LONG_SIZE
+#endif   // _RWSTD_LONG_LONG
+
+
 inline char
 __rw_atomic_exchange (char &__x, char __y, bool)
 {
@@ -1676,8 +1807,13 @@
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (int));
 
+#ifdef _MSC_VER
+    return _InterlockedExchange (_RWSTD_REINTERPRET_CAST (long*, &__x),
+                                 _RWSTD_STATIC_CAST (long, __y));
+#else
     return __rw_atomic_xchg32 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT32_T*, &__x),
                                _RWSTD_STATIC_CAST (_RWSTD_INT32_T, __y));
+#endif
 }
 
 
@@ -1686,8 +1822,13 @@
 {
     _RWSTD_COMPILE_ASSERT (4 == sizeof (unsigned int));
 
+#ifdef _MSC_VER
+    return _InterlockedExchange (_RWSTD_REINTERPRET_CAST (long*, &__x),
+                                 _RWSTD_STATIC_CAST (long, __y));
+#else
     return __rw_atomic_xchg32 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT32_T*, &__x),
                                _RWSTD_STATIC_CAST (_RWSTD_INT32_T, __y));
+#endif
 }
 
 
@@ -1714,6 +1855,44 @@
 
 #  endif   // _RWSTD_LONG_SIZE == _RWSTD_INT_SIZE
 
+
+#ifdef _RWSTD_LONG_LONG
+#  if _RWSTD_LLONG_SIZE > _RWSTD_LONG_SIZE
+
+inline _RWSTD_LONG_LONG
+__rw_atomic_exchange (_RWSTD_LONG_LONG &__x, _RWSTD_LONG_LONG __y, bool)
+{
+    _RWSTD_COMPILE_ASSERT (8 == sizeof (_RWSTD_LONG_LONG));
+
+#ifdef _MSC_VER
+    return _InterlockedExchange64 (_RWSTD_REINTERPRET_CAST (__int64*, &__x),
+                                   _RWSTD_STATIC_CAST (__int64, __y));
+#else
+    return __rw_atomic_xchg64 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT64_T*, &__x),
+                               _RWSTD_STATIC_CAST (_RWSTD_INT64_T, __y));
+#endif
+}
+
+
+inline unsigned _RWSTD_LONG_LONG
+__rw_atomic_exchange (unsigned _RWSTD_LONG_LONG &__x,
+                      unsigned _RWSTD_LONG_LONG __y, bool)
+{
+    _RWSTD_COMPILE_ASSERT (8 == sizeof (unsigned _RWSTD_LONG_LONG));
+
+#ifdef _MSC_VER
+    return _InterlockedExchange64 (_RWSTD_REINTERPRET_CAST (__int64*, &__x),
+                                   _RWSTD_STATIC_CAST (__int64, __y));
+#else
+    return __rw_atomic_xchg64 (_RWSTD_REINTERPRET_CAST (_RWSTD_INT64_T*, &__x),
+                               _RWSTD_STATIC_CAST (_RWSTD_INT64_T, __y));
+#endif
+}
+
+#  endif   // _RWSTD_LLONG_SIZE > _RWSTD_LONG_SIZE
+#endif   // _RWSTD_LONG_LONG
+
+
 #elif !defined (_RWSTD_NO_ATOMIC_OPS)
 #  define _RWSTD_NO_ATOMIC_OPS
 #endif   // _RWSTD_NO_ATOMIC_OPS
diff --git a/include/rw/_traits.h b/include/rw/_traits.h
index cfaa0a4..72b9ba7 100644
--- a/include/rw/_traits.h
+++ b/include/rw/_traits.h
@@ -406,8 +406,9 @@
         // cast to const void* used to get around a gcc 2.95 bug
         // that prevents a static_cast from void* --> const T*
         // (only occurs if memchr() isn't overloaded on const)
-        return _RWSTD_STATIC_CAST (const char_type*,
-                                   (const void*)_RWSTD_MEMCHR (__s, __c, __n));
+        return _RWSTD_STATIC_CAST (
+            const char_type*, (const void*)_RWSTD_MEMCHR (
+                __s, _RWSTD_STATIC_CAST (unsigned char, __c), __n));
     }
 
     static _RWSTD_SIZE_T length (const char_type *__s) {
diff --git a/include/rw/_tree.c b/include/rw/_tree.c
index 76f6837..c934787 100644
--- a/include/rw/_tree.c
+++ b/include/rw/_tree.c
@@ -2,20 +2,27 @@
  *
  * rw/_tree.c
  *
- * $Id: //stdlib/dev/include/rw/_tree.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/sstream b/include/sstream
index 2eafa1d..535d03f 100644
--- a/include/sstream
+++ b/include/sstream
@@ -177,29 +177,31 @@
     void _C_catchup (char_type*);
 };
 
+
 template <class _CharT, class _Traits, class _Allocator>
 inline basic_string<_CharT, _Traits, _Allocator>
 basic_stringbuf<_CharT, _Traits, _Allocator>::
-str () const {
-
-    const char_type * __first = 0;
-    const char_type * __last = 0;
+str () const
+{
+    const char_type* __first = 0;
+    const char_type* __last  = 0;
 
     if (this->_C_is_out ()) {
         // in out only or in|out mode
         __first = this->pbase ();
-        __last = this->egptr () < this->pptr () ?
+        __last  = this->egptr () < this->pptr () ?
             this->pptr () : this->egptr ();
     }
     else if (this->_C_is_in ()) {
         // in in only mode
         __first = this->eback ();
-        __last = this->egptr ();
+        __last  = this->egptr ();
     }
 
     return _C_string_type (__first, __last - __first);
 }
 
+
 template <class _CharT, class _Traits, class _Allocator>
 inline _RWSTD_STREAMSIZE
 basic_stringbuf<_CharT, _Traits, _Allocator>::
diff --git a/include/sstream.c b/include/sstream.c
index dbaddcd..761ec4e 100644
--- a/include/sstream.c
+++ b/include/sstream.c
@@ -2,20 +2,27 @@
  *
  * sstream.c
  *
- * $Id: //stdlib/dev/include/sstream.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/sstream.cc b/include/sstream.cc
index 6ea8b6a..607cd3e 100644
--- a/include/sstream.cc
+++ b/include/sstream.cc
@@ -111,9 +111,6 @@
         }
 
         __buf = __alloc.allocate (__bufsize);
-
-        // take ownsership of the allocated buffer
-        this->_C_own_buf (true);
     }
     else if (0 < __bufsize) {
         // requested capacity is the same or less than the current one
@@ -139,6 +136,9 @@
             if (this->_C_buffer && this->_C_own_buf ())
                 __alloc.deallocate (this->_C_buffer, this->_C_bufsize);
 
+            // take ownership of the allocated buffer
+            this->_C_own_buf (true);
+
             this->_C_buffer  = __buf;
             this->_C_bufsize = __bufsize;
         }
@@ -185,10 +185,16 @@
         const _RWSTD_SIZE_T __bufsize =
             __n + (this->pptr () - this->pbase ());
 
+        // preserve current pptr() since str() would seek to end
+        const streamsize __cur = this->pptr () - this->pbase ();
+
         // grow the buffer if necessary to accommodate the whole
         // string plus the contents of the buffer up to pptr()
         str (this->_C_buffer, __bufsize);
 
+        // restore pptr()
+        this->pbump (__cur - (this->pptr () - this->pbase ()));
+
         _RWSTD_ASSERT (__n <= this->epptr () - this->pptr ());
     }
 
diff --git a/include/stdexcept b/include/stdexcept
index aefe42a..0bb8daf 100644
--- a/include/stdexcept
+++ b/include/stdexcept
@@ -65,6 +65,8 @@
     // extension
     _EXPLICIT domain_error (const char *__s = 0)
         : logic_error (__s) { }
+
+    virtual ~domain_error () _THROWS (());
 };
 
 
@@ -77,6 +79,8 @@
     // extension
     _EXPLICIT invalid_argument (const char *__s = 0)
         : logic_error (__s) { }
+
+    virtual ~invalid_argument () _THROWS (());
 };
 
 
@@ -89,6 +93,8 @@
     // extension
     _EXPLICIT length_error (const char *__s = 0)
         : logic_error (__s) { }
+
+    virtual ~length_error () _THROWS (());
 };
 
 
@@ -101,6 +107,8 @@
     // extension
     _EXPLICIT out_of_range (const char *__s = 0)
         : logic_error (__s) { }
+
+    virtual ~out_of_range () _THROWS (());
 };
 
 
@@ -113,6 +121,8 @@
     // extension
     _EXPLICIT runtime_error (const char *__s = 0)
         : _RW::__rw_exception (__s) { }
+
+    virtual ~runtime_error () _THROWS (());
 };
 
 
@@ -125,6 +135,8 @@
     // extension
     _EXPLICIT range_error (const char *__s = 0)
         : runtime_error (__s) { }
+
+    virtual ~range_error () _THROWS (());
 };
 
 
@@ -137,6 +149,8 @@
     // extension
     _EXPLICIT overflow_error (const char *__s = 0)
         : runtime_error (__s) { }
+
+    virtual ~overflow_error () _THROWS (());
 };
 
 
@@ -149,6 +163,8 @@
     // extension
     _EXPLICIT underflow_error (const char *__s = 0)
         : runtime_error (__s) { }
+
+    virtual ~underflow_error () _THROWS (());
 };
 
 
diff --git a/include/streambuf.c b/include/streambuf.c
index 86e4a64..be78500 100644
--- a/include/streambuf.c
+++ b/include/streambuf.c
@@ -2,20 +2,27 @@
  *
  * streambuf.c
  *
- * $Id: //stdlib/dev/include/streambuf.c#5 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/string b/include/string
index 531f056..129a598 100644
--- a/include/string
+++ b/include/string
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  *
  **************************************************************************/
 
@@ -289,19 +289,19 @@
     }
 
     basic_string& operator+= (value_type __c) {
-        return append (size_type (1), __c);
+        return push_back (__c), *this;
     }
 
     basic_string& append (const basic_string&, size_type, size_type);
 
-    basic_string& append (const basic_string&);
-
-    basic_string& append (const_pointer __s, size_type __n) {
-        return replace (size (), size_type (), __s, __n);
+    basic_string& append (const basic_string &__str) {
+        return append (__str.data (), __str.size ());
     }
 
+    basic_string& append (const_pointer, size_type);
+
     basic_string& append (const_pointer __s) {
-        return replace (size (), size_type (), __s);
+        return append (__s, traits_type::length (__s));
     }
 
 #ifndef _RWSTD_NO_MEMBER_TEMPLATES
@@ -323,26 +323,21 @@
 
     basic_string& append (size_type __n, value_type __c, int) {
         // unnamed arg is used for overload resolution
-        return replace (size (), size_type (), __n, __c);
+        return append (__n, __c);
     }
 
 #else   // if defined (_RWSTD_NO_MEMBER_TEMPLATES)
 
     basic_string& append (const_pointer __first, const_pointer __last) {
-        replace (size (), size_type (), __first, __last - __first);
-        return *this;
+        return append (__first, __last - __first);
     }
 
 #endif   // _RWSTD_NO_MEMBER_TEMPLATES
 
-    basic_string& append (size_type __n, value_type __c) {
-        return replace (size (), size_type (), __n, __c);
-    }
+    basic_string& append (size_type, value_type);
 
     // lwg issue 7
-    void push_back (value_type __c) {
-        append (size_type (1), __c);
-    }
+    void push_back (value_type);
 
     basic_string& assign (const basic_string &__str) {
         return *this = __str;
@@ -1087,6 +1082,26 @@
 
 
 template <class _CharT, class _Traits , class _Allocator>
+inline void
+basic_string<_CharT, _Traits, _Allocator>::
+push_back (value_type __c)
+{
+    const size_type __size0 = size ();
+    const _RWSTD_SIZE_T __size1 = __size0 + 1;
+
+    if (   capacity () < __size1
+        || size_type (1) < size_type (_C_pref ()->_C_get_ref ())) {
+         replace (size (), size_type (), 1, __c);
+    }
+    else {
+        traits_type::assign (_C_data [__size0], __c);
+        traits_type::assign (_C_data [__size1], value_type ());
+        _C_pref ()->_C_size._C_size = __size1;
+    }
+}
+
+
+template <class _CharT, class _Traits , class _Allocator>
 inline void basic_string<_CharT, _Traits, _Allocator>::
 reserve (size_type __cap)
 {
@@ -1108,16 +1123,16 @@
 {
     _RWSTD_REQUIRES (__pos1 <= size (),
                      (_RWSTD_ERROR_OUT_OF_RANGE, 
-                      _RWSTD_FUNC ("basic_string::compare(size_type, "
+                      _RWSTD_FUNC ("basic_string::replace(size_type, "
                                    "size_type, const basic_string&, "
-                                   "size_type, size_type) const"),
+                                   "size_type, size_type)"),
                       __pos1, size ()));
 
     _RWSTD_REQUIRES (__pos2 <= __str.size (),
                      (_RWSTD_ERROR_OUT_OF_RANGE, 
-                      _RWSTD_FUNC ("basic_string::compare(size_type, "
+                      _RWSTD_FUNC ("basic_string::replace(size_type, "
                                    "size_type, const basic_string&, "
-                                   "size_type, size_type) const"),
+                                   "size_type, size_type)"),
                       __pos2, __str.size ()));
 
     const size_type __rem = __str.size () - __pos2;
@@ -1178,16 +1193,55 @@
 template <class _CharT, class _Traits, class _Allocator>
 inline basic_string<_CharT, _Traits, _Allocator>&
 basic_string<_CharT, _Traits, _Allocator>::
-append (const basic_string &__str)
+append (const basic_string &__str, size_type __pos, size_type __n)
 {
-    const size_type __size = size () + __str.size ();
+    _RWSTD_REQUIRES (__pos <= __str.size (),
+                     (_RWSTD_ERROR_OUT_OF_RANGE,
+                      _RWSTD_FUNC ("basic_string::append(const basic_string&,"
+                                   " size_type, size_type)"),
+                      __pos, __str.size ()));
 
-    if (   capacity () < __size
+    const size_type __rlen = _C_min (__str.size() - __pos, __n);
+
+    return append (__str.data () + __pos, __rlen);
+}
+
+
+template <class _CharT, class _Traits, class _Allocator>
+inline basic_string<_CharT, _Traits, _Allocator>&
+basic_string<_CharT, _Traits, _Allocator>::
+append (const_pointer __s, size_type __n)
+{
+    const size_type __size0 = size ();
+    const _RWSTD_SIZE_T __size1 = __size0 + __n;
+
+    if (   capacity () <= __size1
         || size_type (1) < size_type (_C_pref ()->_C_get_ref ()))
-        return append (__str, size_type (), __str.size ());
+        return replace (size (), size_type (), __s, __n);
 
-    traits_type::copy (_C_data + size (), __str.data (), __str.size () + 1);
-    _C_pref ()->_C_size._C_size = __size;
+    traits_type::copy (_C_data + __size0, __s, __n);
+    traits_type::assign (_C_data [__size1], value_type ());
+    _C_pref ()->_C_size._C_size = __size1;
+
+    return *this;
+}
+
+
+template <class _CharT, class _Traits, class _Allocator>
+inline basic_string<_CharT, _Traits, _Allocator>&
+basic_string<_CharT, _Traits, _Allocator>::
+append (size_type __n, value_type __c)
+{
+    const size_type __size0 = size ();
+    const _RWSTD_SIZE_T __size1 = __size0 + __n;
+
+    if (   capacity () < __size1
+        || size_type (1) < size_type (_C_pref ()->_C_get_ref ()))
+        return replace (size (), size_type (), __n, __c);
+
+    traits_type::assign (_C_data + __size0, __n, __c);
+    traits_type::assign (_C_data [__size1], value_type ());
+    _C_pref ()->_C_size._C_size = __size1;
 
     return *this;
 }
diff --git a/include/string.c b/include/string.c
index b49a957..5514cb5 100644
--- a/include/string.c
+++ b/include/string.c
@@ -2,20 +2,27 @@
  *
  * string.c
  *
- * $Id: //stdlib/dev/include/string.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/string.cc b/include/string.cc
index 815fde4..bb26472 100644
--- a/include/string.cc
+++ b/include/string.cc
@@ -241,34 +241,6 @@
 template <class _CharT, class _Traits, class _Allocator>
 basic_string<_CharT, _Traits, _Allocator>&
 basic_string<_CharT, _Traits, _Allocator>::
-append (const basic_string &__str, size_type __pos, size_type __n)
-{
-    _RWSTD_REQUIRES (__pos <= __str.size (),
-                     (_RWSTD_ERROR_OUT_OF_RANGE,
-                      _RWSTD_FUNC ("basic_string::append(const basic_string&,"
-                                   " size_type, size_type)"),
-                      __pos, __str.size ()));
-
-    if (__n > __str.size () - __pos)
-        __n = __str.size () - __pos;
-
-    const size_type __rlen = _C_min (__str.size() - __pos, __n);
-
-    _RWSTD_REQUIRES (size () <= max_size () - __rlen,
-                     (_RWSTD_ERROR_LENGTH_ERROR,
-                      _RWSTD_FUNC ("basic_string::append(const basic_string&,"
-                                   " size_type, size_type)"),
-                      size (), max_size () - __rlen));
-
-    replace (size (), size_type (), __str.c_str () + __pos, __n);
-
-    return *this;
-}
-
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::
 assign (const basic_string &__str, size_type __pos, size_type __n)
 {
     _RWSTD_REQUIRES (__pos <= __str.size (),
@@ -340,18 +312,22 @@
     _RWSTD_REQUIRES (__pos1 <= __size0,
                      (_RWSTD_ERROR_OUT_OF_RANGE, 
                      _RWSTD_FUNC ("basic_string::replace(size_type, size_type"
-                                  ", const_pointer, size_type, size_type, "
-                                  "size_type)"), 
+                                  ", const_pointer, size_type)"), 
                       __pos1, __size0 > __n2 ? __size0 : __n2));
 
     // number of characters to delete
     const size_type __xlen = _C_min (__n1, __size0 - __pos1);
 
+    _RWSTD_REQUIRES (__n2 <= max_size (),
+                     (_RWSTD_ERROR_LENGTH_ERROR,
+                     _RWSTD_FUNC ("basic_string::replace(size_type, size_type"
+                                  ", const_pointer, size_type)"), 
+                     __n2, max_size()));
+
     _RWSTD_REQUIRES (__size0 - __xlen <= max_size () - __n2,
                      (_RWSTD_ERROR_LENGTH_ERROR,
                      _RWSTD_FUNC ("basic_string::replace(size_type, size_type"
-                                  ", const_pointer, size_type, size_type, "
-                                  "size_type)"), 
+                                  ", const_pointer, size_type)"), 
                       __size0 - __xlen, max_size() - __n2));
 
     // compute the resulting string size
@@ -753,12 +729,6 @@
 {
     _RWSTD_ASSERT(__s != 0);
 
-    _RWSTD_REQUIRES (__n <= max_size (),
-                     (_RWSTD_ERROR_LENGTH_ERROR, 
-                      _RWSTD_FUNC ("basic_string::rfind(const_pointer, "
-                                   "size_type, size_type) const"),
-                      __n, max_size ()));
-
     if (size() < __n)
       return npos;
     
@@ -782,12 +752,6 @@
 {
     _RWSTD_ASSERT(__s != 0);
 
-    _RWSTD_REQUIRES (__n <= max_size (),
-                     (_RWSTD_ERROR_LENGTH_ERROR,
-                      _RWSTD_FUNC ("basic_string::find_first_of(const_pointer, "
-                                   "size_type, size_type) const"),
-                      __n, max_size ()));
-
     for (size_type __xpos = __pos; __xpos < size() ; __xpos++)
     {
       for (size_type __i = 0; __i < __n ; __i++)
@@ -806,12 +770,6 @@
 {
     _RWSTD_ASSERT(__s != 0);
 
-    _RWSTD_REQUIRES (__n <= max_size (),
-                     (_RWSTD_ERROR_LENGTH_ERROR, 
-                      _RWSTD_FUNC ("basic_string::find_last_of(const_pointer, "
-                                   "size_type, size_type) const"),
-                      __n, max_size ()));
-
     if (size())
     {
       size_type __slen = size() -1;
@@ -834,12 +792,6 @@
 {
     _RWSTD_ASSERT(__s != 0);
 
-    _RWSTD_REQUIRES (__n <= max_size (),
-                     (_RWSTD_ERROR_LENGTH_ERROR, 
-                      _RWSTD_FUNC ("basic_string::find_first_not_of("
-                                  "const_pointer, size_type, size_type) const"),
-                      __n, max_size ()));
-
     for (size_type __xpos = __pos; __xpos < size() ; __xpos++)
     {
       bool __found = false;
@@ -866,12 +818,6 @@
 {
     _RWSTD_ASSERT(__s != 0);
 
-    _RWSTD_REQUIRES (__n <= max_size (),
-                     (_RWSTD_ERROR_LENGTH_ERROR, 
-                      _RWSTD_FUNC ("basic_string::find_last_not_of("
-                                  "const_pointer, size_type, size_type) const"),
-                      __n, max_size ()));
-    
     if (size())
     {
       size_type __slen = size() -1;
diff --git a/include/tr1/cstdint b/include/tr1/cstdint
index 4c76c54..0ce2ede 100644
--- a/include/tr1/cstdint
+++ b/include/tr1/cstdint
@@ -324,8 +324,8 @@
 
 #define SIZE_MAX            _RWSTD_SIZE_MAX
 
-#define WCHAR_MIN           _RWSTD_WCHAR_T_MIN
-#define WCHAR_MAX           _RWSTD_WCHAR_T_MAX
+#define WCHAR_MIN           _RWSTD_WCHAR_MIN
+#define WCHAR_MAX           _RWSTD_WCHAR_MAX
 
 #define WINT_MIN            _RWSTD_WINT_MIN
 #define WINT_MAX            _RWSTD_WINT_MAX
diff --git a/include/valarray b/include/valarray
index c84634f..ba5b6e1 100644
--- a/include/valarray
+++ b/include/valarray
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -1196,7 +1196,7 @@
 template<class _TypeT>
 inline valarray<_TypeT> atan2 (const valarray<_TypeT> &__x, const _TypeT &__y)
 {
-    _RW::__rw_array<_TypeT> __tmp (__x.size ());
+    _RW::__rw_array<_TypeT> __tmp (_TypeT (0), __x.size ());
 
     for (_RWSTD_SIZE_T __i = 0; __i != __tmp.size (); ++__i)
         __tmp [__i] = _RWSTD_C::atan2 (__x [__i], __y);
@@ -1207,7 +1207,7 @@
 template<class _TypeT>
 inline valarray<_TypeT> atan2 (const _TypeT &__x, const valarray<_TypeT> &__y)
 {
-    _RW::__rw_array<_TypeT> __tmp (__y.size ());
+    _RW::__rw_array<_TypeT> __tmp (_TypeT (0), __y.size ());
 
     for (_RWSTD_SIZE_T __i = 0; __i != __tmp.size (); ++__i)
         __tmp [__i] = _RWSTD_C::atan2 (__x, __y [__i]);
@@ -1298,7 +1298,7 @@
 
     slice_array (const slice_array &__rhs)
         : _C_array(__rhs.get_ref_mem_array()),
-          _C_slice(__rhs.get_slice())
+          _C_slice(__rhs._C_get_slice())
         { }
           
     // implementation
@@ -1311,7 +1311,7 @@
         return _C_array;
     }
 
-    slice get_slice () const {
+    slice _C_get_slice () const {
         return _C_slice;
     }
 
@@ -1464,7 +1464,7 @@
 
     gslice_array (const gslice_array<value_type>& __rhs)
         : _C_array (__rhs.get_ref_mem_array ()),
-          _C_slice (__rhs.get_slice ())
+          _C_slice (__rhs._C_get_slice ())
         { }
 
     gslice_array (_RW::__rw_array<value_type>* __a, const gslice & __s)
@@ -1478,7 +1478,7 @@
         return _C_array;
     }
 
-    gslice get_slice () const {
+    gslice _C_get_slice () const {
         return _C_slice;
     }
 
@@ -1517,7 +1517,7 @@
 
     mask_array (const mask_array<value_type> &__rhs)
         : _C_array (__rhs.get_ref_mem_array ()),
-          _C_valarray (__rhs.get_array ())
+          _C_valarray (__rhs._C_get_array ())
         { }
 
     mask_array (_RW::__rw_array<value_type> *__a, const valarray<bool>& __val)
@@ -1529,11 +1529,11 @@
         return _C_array;
     }
 
-    valarray<bool> get_array () const {
+    valarray<bool> _C_get_array () const {
         return _C_valarray;
     }
 
-    const valarray<bool>* get_array_pt () const {
+    const valarray<bool>* _C_get_array_ptr () const {
         return &_C_valarray;
     }
 
@@ -1624,7 +1624,7 @@
 
     indirect_array (const indirect_array<value_type>& __sl)
       :_C_array (__sl.get_ref_mem_array ()),
-       _C_valarray (__sl.get_array ())
+       _C_valarray (__sl._C_get_array ())
         { }
 
     indirect_array (_RW::__rw_array<value_type>   *__a,
@@ -1637,11 +1637,11 @@
         return _C_array;
     }
 
-    valarray<_RWSTD_SIZE_T> get_array () const {
+    valarray<_RWSTD_SIZE_T> _C_get_array () const {
         return _C_valarray;
     }
 
-    const valarray<_RWSTD_SIZE_T>* get_array_pt () const {
+    const valarray<_RWSTD_SIZE_T>* _C_get_array_ptr () const {
         return &_C_valarray;
     }
 
@@ -1734,7 +1734,7 @@
 {
     _RWSTD_ASSERT (0 != __lhs.get_ref_mem_array ());
 
-    _STD::slice __slice           = __lhs.get_slice ();
+    _STD::slice __slice           = __lhs._C_get_slice ();
     _RW::__rw_array<_TypeT> &__ar = *__lhs.get_ref_mem_array ();
 
     for (_RWSTD_SIZE_T __i = __slice.start (), __j = 0;
@@ -1754,7 +1754,7 @@
 {
     _RWSTD_ASSERT (0 != __lhs.get_ref_mem_array ());
 
-    _STD::slice __slice           = __lhs.get_slice ();
+    _STD::slice __slice           = __lhs._C_get_slice ();
     _RW::__rw_array<_TypeT> &__ar = *__lhs.get_ref_mem_array ();
 
     for (_RWSTD_SIZE_T __i = __slice.start (), __j = 0;
@@ -1775,7 +1775,7 @@
     _RWSTD_ASSERT (0 != __lhs.get_ref_mem_array ());
 
     _RW::__rw_array<_TypeT>    &__ar    = *__lhs.get_ref_mem_array ();
-    const _STD::valarray<bool> &__vlray = *__lhs.get_array_pt ();
+    const _STD::valarray<bool> &__vlray = *__lhs._C_get_array_ptr ();
 
     for (_RWSTD_SIZE_T __i = 0, __j = 0; __i != __vlray.size (); ++__i)
         if (__vlray [__i])
@@ -1792,7 +1792,7 @@
     _RWSTD_ASSERT (0 != __lhs.get_ref_mem_array ());
 
     _RW::__rw_array<_TypeT>    &__ar    = *__lhs.get_ref_mem_array ();
-    const _STD::valarray<bool> &__vlray = *__lhs.get_array_pt ();
+    const _STD::valarray<bool> &__vlray = *__lhs._C_get_array_ptr ();
 
     for (_RWSTD_SIZE_T __i = 0, __j = 0; __i != __vlray.size (); ++__i)
         if (__vlray [__i])
@@ -1809,7 +1809,7 @@
     _RWSTD_ASSERT (0 != __lhs.get_ref_mem_array ());
 
     _RW::__rw_array<_TypeT>             &__ar    = *__lhs.get_ref_mem_array ();
-    const _STD::valarray<_RWSTD_SIZE_T> &__vlray = *__lhs.get_array_pt ();
+    const _STD::valarray<_RWSTD_SIZE_T> &__vlray = *__lhs._C_get_array_ptr ();
 
     for (_RWSTD_SIZE_T __i = 0; __i != __vlray.size (); ++__i)
         __ar [__vlray [__i]] = __fun (__rhs [__i]);
@@ -1826,7 +1826,7 @@
     _RWSTD_ASSERT (0 != __lhs.get_ref_mem_array ());
 
     _RW::__rw_array<_TypeT>             &__ar    = *__lhs.get_ref_mem_array ();
-    const _STD::valarray<_RWSTD_SIZE_T> &__vlray = *__lhs.get_array_pt ();
+    const _STD::valarray<_RWSTD_SIZE_T> &__vlray = *__lhs._C_get_array_ptr ();
 
     for (_RWSTD_SIZE_T __i = 0; __i != __vlray.size (); ++__i)
         __ar [__vlray [__i]] = __fun (__ar [__vlray [__i]], __rhs [__i]);
@@ -2034,6 +2034,9 @@
 
 inline _RWSTD_SIZE_T gslice::ind_numb() const
 {
+    if (_C_length.size () == 0)
+        return 0;
+
     _RWSTD_SIZE_T __inx = 1;
 
     for(_RWSTD_SIZE_T __i = 0; __i < _C_length.size (); ++__i)
@@ -2074,15 +2077,15 @@
 inline valarray<_TypeT>::valarray (const slice_array<_TypeT>& sl_ar)
 {
     _RW::__rw_array <_TypeT> __tmp =
-        _RW::__rw_array <_TypeT>(_TypeT (), sl_ar.get_slice ().size());
+        _RW::__rw_array <_TypeT>(_TypeT (), sl_ar._C_get_slice ().size());
       
-    _RWSTD_SIZE_T __i = sl_ar.get_slice().start();
+    _RWSTD_SIZE_T __i = sl_ar._C_get_slice().start();
     _RWSTD_SIZE_T __cpt = 0; 
 
-    while( __cpt < sl_ar.get_slice().size() )
+    while( __cpt < sl_ar._C_get_slice().size() )
     {
         __tmp[__cpt] = (*(sl_ar.get_ref_mem_array()))[__i];
-        __i+= sl_ar.get_slice().stride();
+        __i+= sl_ar._C_get_slice().stride();
         __cpt++;
     }
 
@@ -2095,15 +2098,15 @@
 valarray<_TypeT>::operator= (const slice_array<_TypeT>& sl_ar)
 { 
     _RW::__rw_array <_TypeT> __tmp =
-        _RW::__rw_array <_TypeT>(_TypeT (), sl_ar.get_slice ().size());
+        _RW::__rw_array <_TypeT>(_TypeT (), sl_ar._C_get_slice ().size());
 
-    _RWSTD_SIZE_T __i = sl_ar.get_slice().start();
+    _RWSTD_SIZE_T __i = sl_ar._C_get_slice().start();
     _RWSTD_SIZE_T __cpt = 0; 
 
-    while( __cpt < sl_ar.get_slice().size() )
+    while( __cpt < sl_ar._C_get_slice().size() )
     {
       __tmp[__cpt] = (*(sl_ar.get_ref_mem_array()))[__i];
-      __i+= sl_ar.get_slice().stride();
+      __i+= sl_ar._C_get_slice().stride();
       __cpt++;
     }
 
@@ -2141,18 +2144,18 @@
 template <class _TypeT>
 inline valarray<_TypeT>::valarray(const gslice_array<_TypeT>& sl_ar)
 {
-    gslice sl(sl_ar.get_slice());
+    gslice __sl(sl_ar._C_get_slice());
 
     _RW::__rw_array <_TypeT> __tmp =
-        _RW::__rw_array <_TypeT>(_TypeT (), sl.ind_numb());
+        _RW::__rw_array <_TypeT>(_TypeT (), __sl.ind_numb());
 
-    _RWSTD_SIZE_T __i = sl.next_ind();
+    _RWSTD_SIZE_T __i = __sl.next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( !sl.is_reseted() )
+    while( !__sl.is_reseted() )
     {
       __tmp[__cpt] = (*(sl_ar.get_ref_mem_array()))[__i];
-      __i= sl.next_ind();
+      __i= __sl.next_ind();
       __cpt++;
     }
 
@@ -2164,18 +2167,18 @@
 inline valarray<_TypeT>&
 valarray<_TypeT>::operator= (const gslice_array<_TypeT>& sl_ar)
 { 
-    gslice sl(sl_ar.get_slice());
+    gslice __sl(sl_ar._C_get_slice());
 
     _RW::__rw_array <_TypeT> __tmp =
-        _RW::__rw_array <_TypeT>(_TypeT (), sl.ind_numb());
+        _RW::__rw_array <_TypeT>(_TypeT (), __sl.ind_numb());
 
-    _RWSTD_SIZE_T __i = sl.next_ind();
+    _RWSTD_SIZE_T __i = __sl.next_ind();
     _RWSTD_SIZE_T __cpt = 0;
 
-    while( !sl.is_reseted() )
+    while( !__sl.is_reseted() )
     {
       __tmp[__cpt] = (*(sl_ar.get_ref_mem_array()))[__i];
-      __i= sl.next_ind();
+      __i= __sl.next_ind();
       __cpt++;
     }
 
@@ -2212,20 +2215,20 @@
 inline valarray<_TypeT>::valarray(const mask_array<_TypeT>& __rhs)
 {
 
-    mask_array<_TypeT>  *msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
-    const valarray<bool>*sec = msk->get_array_pt();
+    mask_array<_TypeT>  *__msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
+    const valarray<bool>*__sec = __msk->_C_get_array_ptr();
 
     _RWSTD_SIZE_T __i, __n = 0;
 
-    for(__i = 0; __i < sec->size(); __i++)
-        if ( (*sec)[__i]) __n++;
+    for(__i = 0; __i < __sec->size(); __i++)
+        if ( (*__sec)[__i]) __n++;
 
     _RW::__rw_array <_TypeT> __tmp = _RW::__rw_array <_TypeT>(_TypeT (), __n);
       
     _RWSTD_SIZE_T __cpt = 0; 
 
-    for( __i=0; __i < sec->size(); __i++ )
-      if ( (*sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
+    for( __i=0; __i < __sec->size(); __i++ )
+      if ( (*__sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
 
     _C_array.swap (__tmp);
 }
@@ -2235,21 +2238,21 @@
 inline valarray<_TypeT>&
 valarray<_TypeT>::operator= (const mask_array<_TypeT>& __rhs)
 { 
-    mask_array<_TypeT>  *msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
-    const valarray<bool>*sec = msk->get_array_pt();
+    mask_array<_TypeT>  *__msk = _RWSTD_CONST_CAST (mask_array<_TypeT>*, &__rhs);
+    const valarray<bool>*__sec = __msk->_C_get_array_ptr();
 
     _RWSTD_SIZE_T __i, __n = 0;
 
-    for (__i = 0; __i < sec->size(); __i++)
-        if ((*sec)[__i])
+    for (__i = 0; __i < __sec->size(); __i++)
+        if ((*__sec)[__i])
             __n++;
 
     _RW::__rw_array <_TypeT> __tmp = _RW::__rw_array <_TypeT>(_TypeT (), __n);
       
     _RWSTD_SIZE_T __cpt = 0; 
 
-    for( __i=0; __i < sec->size(); __i++ )
-      if ( (*sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
+    for( __i=0; __i < __sec->size(); __i++ )
+      if ( (*__sec)[__i]) __tmp[__cpt++] = (*(__rhs.get_ref_mem_array()))[__i];
 
     if ( &_C_array == __rhs.get_ref_mem_array() )
       _C_array.resize(0); 
@@ -2291,7 +2294,7 @@
     indirect_array<_TypeT> *__ia =
         _RWSTD_CONST_CAST (indirect_array<_TypeT>*, &__rhs);
 
-    const valarray<_RWSTD_SIZE_T> *__sec = __ia->get_array_pt();
+    const valarray<_RWSTD_SIZE_T> *__sec = __ia->_C_get_array_ptr();
 
     _RW::__rw_array <_TypeT> __tmp =
         _RW::__rw_array <_TypeT>(_TypeT (), __sec->size());
@@ -2312,7 +2315,7 @@
     indirect_array<_TypeT> *__ia =
         _RWSTD_CONST_CAST (indirect_array<_TypeT>*, &__rhs);
 
-    const valarray<_RWSTD_SIZE_T> *__sec = __ia->get_array_pt();
+    const valarray<_RWSTD_SIZE_T> *__sec = __ia->_C_get_array_ptr();
 
     _RW::__rw_array <_TypeT> __tmp =
         _RW::__rw_array <_TypeT>(_TypeT (), __sec->size());
diff --git a/include/valarray.c b/include/valarray.c
index bf7eeea..b182d8d 100644
--- a/include/valarray.c
+++ b/include/valarray.c
@@ -2,20 +2,27 @@
  *
  * valarray.c
  *
- * $Id: //stdlib/dev/include/valarray.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/vector b/include/vector
index 5881a98..9e152f2 100644
--- a/include/vector
+++ b/include/vector
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  *
  ***************************************************************************
  *
@@ -843,10 +843,17 @@
         // On Sun, gcc 3.1 does generate an incorrect copy constructor
         // that has as an effect an incompletely/incorrectly initialized 
         // iterator.
-#if defined (__sun__) && defined (__GNUG__) 
+#if    defined (__sun__) && defined (__GNUG__) \
+    || defined (__SUNPRO_CC) && defined (__amd64__)
+
+        // working around a gcc 3.1 bug on Solaris where the compiler
+        // generates bad code for the implicitly defined copy ctor
+        // also working around a Sun C++ 5.9 optimizer ICE on x86_64
+        // in wide (64-bit) mode (see STDCXX-551)
+
         _C_iter (const _C_iter& __it)
             : _C_p (__it._C_p), _C_offset (__it._C_offset) {}
-#endif // __GNUG__
+#endif   // gcc 3.1/Solaris || Sun C++ 5.9/x86_64
 
         void operator++ () {
             if (_C_offset++ == _RWSTD_WORD_BIT - 1) {
diff --git a/include/vector.c b/include/vector.c
index c0c264d..9e6f42c 100644
--- a/include/vector.c
+++ b/include/vector.c
@@ -2,20 +2,27 @@
  *
  * vector.c
  *
- * $Id: //stdlib/dev/include/vector.c#9 $
+ * $Id$
  *
  ***************************************************************************
  *
- * Copyright (c) 1994-2005 Quovadx,  Inc., acting through its  Rogue Wave
- * Software division. Licensed under the Apache License, Version 2.0 (the
- * "License");  you may  not use this file except  in compliance with the
- * License.    You    may   obtain   a   copy   of    the   License    at
- * http://www.apache.org/licenses/LICENSE-2.0.    Unless   required    by
- * applicable law  or agreed to  in writing,  software  distributed under
- * the License is distributed on an "AS IS" BASIS,  WITHOUT WARRANTIES OR
- * CONDITIONS OF  ANY KIND, either  express or implied.  See  the License
- * for the specific language governing permissions  and limitations under
- * the License.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/include/vector.cc b/include/vector.cc
index 0c19797..de03f2a 100644
--- a/include/vector.cc
+++ b/include/vector.cc
@@ -111,9 +111,10 @@
 {
     _RWSTD_ASSERT_RANGE (__first, end ());
 
-    for (size_type __n = end () - __first; !(0 == __n); --__n) {
-        _RWSTD_VALUE_ALLOC (_C_value_alloc_type, *this, destroy (--_C_end));
-    }
+    _C_value_alloc_type __alloc = _RWSTD_VALUE_ALLOC_CAST (*this);
+
+    for (size_type __n = end () - __first; !(0 == __n); --__n)
+        __alloc.destroy (--_C_end);
 }
 
 
@@ -650,8 +651,10 @@
                 __self->_C_push_back (*__p);
 
             // over the range of elements moved above
-            for (pointer __q = __end; __movend < __q--; )
+            for (pointer __q = __end; __movend < __q; ) {
+                --__q;
                 *__q = *(__q - __size2);
+            }
         }
         else {
             // compute the length of the initial subsequence of the range
diff --git a/src/ChangeLog b/src/ChangeLog
index cc940a6..d491eb6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,611 @@
+2007-08-06  Martin Sebor  <sebor@roguewave.com>
+
+	* ChangeLog: Updated, keeping original TABs.
+
+2007-07-27 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	* gcc.config [__CYGWIN__]: Added -D_REENTRANT option in
+	multithreaded builds. Don't define AS_EXT as .s.
+	* atomic.s [__CYGWIN__]: Prepend symbol names by '_'.
+
+2007-07-17  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-486
+	* time_put.cpp (tzset): Added throw() to the declaration.
+
+2007-07-13  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-485
+	* locale_body.cpp (_C_manage): Reset the capacity of the locale
+	buffer to the capacity of the statically allocated buffer after
+	its size shrinks below that level.
+
+2007-07-10 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	STDCXX-508
+	* catalog.cpp (catopen): while() loop replaced to for() loop
+	with checking for max iterations.
+
+2007-07-08  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-478
+	* locale_eq.cpp (operator==): Removed the assumption that the same
+	user-defined facets must be stored at the same index in the array
+	in order for two locales in which they are installed to compare
+	equal.
+
+2007-07-08  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-477
+	* locale_eq.cpp (operator==): Considered the names of locales when
+	all their standard and byname facet masks are the same and all their
+	facet pointers are the same.
+
+2007-07-08  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-395
+	* etc/config/src/LIMITS.cpp (_RWSTD_WCHAR_T_MAX, _RWSTD_WCHAR_T_MIN,
+	_RWSTD_WCHAR_T_SIZE): Renamed to _RWSTD_WCHAR_MAX, _RWSTD_WCHAR_MIN,
+	and _RWSTD_WCHAR_SIZE, respectively, for consistency with the libc
+	macros.
+	* tests/src/locale.cpp: Same.
+	* tests/src/char.cpp: Same.
+	* tests/src/printf.cpp: Same.
+	* tests/localization/22.locale.codecvt.out.cpp: Same.
+	* tests/self/0.printf.cpp: Same.
+	* include/limits: Same.
+	* include/tr1/cstdint: Same.
+	* include/ansi/_cwchar.h: Same.
+	* src/wctype.cpp: Same.
+	* src/wcodecvt.cpp: Same.
+	* util/ctype.cpp: Same.
+	* util/charmap.cpp: Same.
+
+2007-07-06  Martin Sebor  <sebor@roguewave.com>
+
+	* ctype_bits.cpp (_RWSTD_NO_V3_LOCALE): Removed unnecessary guards
+	and replaces references to _V3_LOCALE with _STD and std, whichever
+	is appropriate.
+	* time_get.cpp: Same.
+	* iso2022.cpp: Same.
+	* wctype.cpp: Same.
+	* iso2022.h: Same.
+	* locale_bits.cpp: Same.
+	* locale_eq.cpp: Same.
+	* codecvt.cpp: Same.
+	* locale_name.cpp: Same.
+	* locale_classic.cpp: Same.
+	* locale_core.cpp: Same.
+	* wcodecvt.cpp: Same.
+	* locale_global.cpp: Same.
+	* locale_body.h: Same.
+	* locale_combine.cpp: Same.
+
+2007-07-06  Martin Sebor  <sebor@roguewave.com>
+
+	* mman.h: Header with declarations of portability helper functions
+	for the manipulation of memory mapped files.
+	* mman.cpp: Definitions of the said helpers.
+	* facet.cpp (__rw_mmap, __rw_unmmap): Moved functions to mman.cpp.
+
+2007-07-05  Martin Sebor  <sebor@roguewave.com>
+
+	* use_facet.h (_RWSTD_DEFINE_FACET_FACTORY): Documented macro
+	and "constified" a local variable in its definition.
+
+2007-07-05  Martin Sebor  <sebor@roguewave.com>
+
+	* stdexcept (range_error, domain_error, runtime_error): Declared
+	virtual destructors instead of relying on the compiler to generate
+	them automatically to avoid generating the class vtable in every
+	translation unit that uses each of the classes.
+	* range_error.cpp: Defined range_error destructor.
+	* domain_error.cpp: Defined domain_error destructor.
+	* runtime_error.cpp: Defined runtime_error destructor.
+
+2007-06-28  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-461
+	* num_put.cpp (__rw_fix_flt): Corrected the formatting of Infinities
+	and NaN's when precision exceeds the length of the formatted string.
+
+2007-06-23  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-457
+	* podarray.cc: Updated license statement.
+	* podarray.c: Same.
+	* version.cpp: Updated copyright.
+
+2007-06-23  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-457
+	* catalog.h: Updated license statement.
+	* access.h: Same.
+	* use_facet.h: Same.
+	* iso2022.h: Same.
+	* setlocale.h: Same.
+	* version.cpp: Same.
+	* iosdata.h: Same.
+	* locale_body.h: Same.
+	* strtol.h: Same.
+
+2007-06-23  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-457
+	* ti_istream.cpp: Updated license statement.
+	* ti_stringbuf.cpp: Same.
+	* ti_string.cpp: Same.
+	* ti_wmoney_put.cpp: Same.
+	* ctype_bits.cpp: Same.
+	* ti_ostream.cpp: Same.
+	* memory.cpp: Same.
+	* ti_wstreambuf.cpp: Same.
+	* ti_collate.cpp: Same.
+	* ti_insert_dbl.cpp: Same.
+	* strtol.cpp: Same.
+	* ti_wistream.cpp: Same.
+	* ti_wnumpunct.cpp: Same.
+	* ti_moneypunct.cpp: Same.
+	* ti_wostream.cpp: Same.
+	* time_get.cpp: Same.
+	* iso2022.cpp: Same.
+	* ti_winsert_int.cpp: Same.
+	* limits.cpp: Same.
+	* ti_numpunct.cpp: Same.
+	* ti_wcollate.cpp: Same.
+	* ti_wmoney_get.cpp: Same.
+	* ti_money_put.cpp: Same.
+	* ti_winsert_ptr.cpp: Same.
+	* ti_num_put.cpp: Same.
+	* ti_streambuf.cpp: Same.
+	* ti_ios.cpp: Same.
+	* locale_core.cpp: Same.
+	* ti_wstring.cpp: Same.
+	* typeinfo.cpp: Same.
+	* assert.cpp: Same.
+	* ti_winsert_dbl.cpp: Same.
+	* ti_wtime_put.cpp: Same.
+	* ti_wnum_put.cpp: Same.
+	* ios_bits.cpp: Same.
+	* ti_wios.cpp: Same.
+	* rwstderr.cpp: Same.
+	* locale_bits.cpp: Same.
+	* random.cpp: Same.
+	* ti_money_get.cpp: Same.
+	* ti_time_put.cpp: Same.
+	* ti_wmoneypunct.cpp: Same.
+	* locale_eq.cpp: Same.
+	* strstream.cpp: Same.
+	* version.cpp: Same.
+	* ti_wstringbuf.cpp: Same.
+	* num_put.cpp: Same.
+	* codecvt.cpp: Same.
+	* vecbool.cpp: Same.
+	* ios.cpp: Same.
+	* ti_num_get.cpp: Same.
+	* catalog.cpp: Same.
+	* ti_wmessages.cpp: Same.
+	* locale_name.cpp: Same.
+	* locale_classic.cpp: Same.
+	* ti_messages.cpp: Same.
+	* ti_insert_int.cpp: Same.
+	* locale_global.cpp: Same.
+	* ti_wtime_get.cpp: Same.
+	* ti_wnum_get.cpp: Same.
+	* limits_bits.cpp: Same.
+	* ti_insert_ptr.cpp: Same.
+	* ti_time_get.cpp: Same.
+	* locale_combine.cpp: Same.
+
+2007-06-22 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	* _error.h(__rw_free_what_buf): Removed inline in declaration.
+	* exception.cpp(__rw_free_what_buf): The same.
+
+2007-06-22 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	STDCXX-454
+	* _error.h: Added declaration of the __rw_free_what_buf.
+	* exception.cpp (__rw_free_what_buf): Added _RWSTD_EXPORT to prototype.
+	Added assertion on __rw_what_refcnt value.
+	(_C_assign): If whatstr == __rw_what_buf, just reuse it without
+	allocation
+	of the new buffer.
+	* rwexcept.cpp: Use __rw_free_what_buf() instead of delete[].
+
+2007-06-21 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	STDCXX-293
+	* exception.cpp (__rw_throw): Don't delete allocated what string because
+	of __rw_throw_proc() takes ownership and must delete what string.
+
+2007-06-21 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	STDCXX-293
+	* exception.cpp (__rw_free_what_buf): New function to free buffer,
+	allocated by __rw_vfmtwhat().
+	Used __rw_free_what_buf() instead of delete[].
+
+2007-06-19  Martin Sebor  <sebor@roguewave.com>
+
+	* punct.cpp (_RWSTD_NO_V3_LOCALE): Removed a dead guard.
+	(_RWSTD_SIZE_T): Replaced with size_t throughout.
+	Removed the :: scope resolution operator from references
+	to C library functions.
+
+2007-06-09  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-446
+	STDCXX-447
+	* complex (pow, operator>>, operator<<): Removed inline definitions.
+	* complex.cc (pow, operator>>, operator<<): Defined out-of-line and
+	exported.
+	* complex.c: #included complex.cc.
+	* export.cpp (<complex>, complex.cc): #included.
+
+2007-06-08  Martin Sebor  <sebor@roguewave.com>
+
+	* src/wctype.cpp (do_widen): Explicitly specified template argument
+	list to work around HP aCC 3 and 5 bug resulting in Error 331: Illegal
+	cast expression; cannot cast expression type '<no type>' to 'wchar_t'.
+	See STDCXX-445.
+
+2007-06-07  Martin Sebor  <sebor@roguewave.com>
+
+	* _ctype.h (do_toupper, do_tolower, do_widen, do_narrow): Outlined
+	virtual member functions of ctype<wchar_t> since they can almost
+	never be inlined anyway.
+	* wctype.cpp: Same.
+
+2007-06-06 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	STDCXX-188
+	* typeinfo.cpp: use ::_C_name or std::_C_name depending on
+	_RWSTD_NO_STD_TYPE_INFO macro.
+
+2007-06-05 Farid Zaripov <Farid_Zaripov@epam.com>
+
+	STDCXX-188
+	* typeinfo.cpp: silenced warning: _C_name was declared
+	but never referenced
+
+2007-06-01  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-432
+	* _config.h (_config-eccp.h): Avoided #including when using HP aCC.
+	* exception.cpp (stdarg.h): Used _RWSTD_EDG_ECCP to guard against
+	inclusion when using EDG eccp based compilers including HP aCC 6.
+
+2007-05-28  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-402
+	* strtol.cpp (__rw_strtoul, __rw_strtol, __rw_strtoull, __rw_strtoll):
+	Asserted preconditions.
+	(LLong, ULLong): New convenience typedefs at namespace scope.
+	(__rw_strtoull, __rw_strtoll): Corrected off by one errors.
+
+2007-05-15  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-417
+	* atomic.s (TYPE_DIR): New macro conditionally defined to the .type
+	directive for GNU as on ELF targets.
+
+2007-05-15  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-416
+	* stdexcept (logic_error): Declared dtor.
+	* logic_error.cpp: New file.
+	(logic_error): Defined class dtor
+
+2007-04-07  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-387
+	* DAYLIGHT.cpp: New config test to determine whether the system
+	supports the XSI POSIX extension daylight.
+	* time_put.cpp (daylight): #defined to 0 when _RWSTD_NO_DAYLIGHT
+	is #defined.
+
+2007-03-28  Martin Sebor  <sebor@roguewave.com>
+
+	* ctype.cpp (ctype_byname ctor): Asserted a precondition.
+	(_RWSTD_NO_V3_LOCALE, _V3_LOCALE): Removed/replaced obsolete macros.
+
+2007-03-07  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-349
+	* iostore.cpp (_C_copyfmt): Zeroed out a_size array to prevent
+	(bogus) gcc warnings about the variable being used uninitialized.
+
+2007-01-04 Farid Zaripov <faridz@kyiv.vdiweb.com>
+
+	* string.cpp (__rw_memchr, __rw_wmemchr): Fixed bug: the function
+	returns incorrect result when nbytes == 0 and *src == c
+
+2006-12-11  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-309
+	* valarray (operator[]): Invoked next_ind() at most once per each
+	iteration of the loop.
+	* valarray.cpp (next_ind): Returned start() instead of 0 after
+	wrapping around.
+
+2006-12-05  Martin Sebor  <sebor@roguewave.com>
+
+	* string.cpp (__rw_memcpy, __rw_memmove, __rw_memchr, __rw_memset,
+	__rw_memcmp, __rw_strlen): Defined each helper without depending
+	on the corresponding libc function in order to avoid infinite
+	recursion.
+	(__rw_wmemcpy, __rw_wmemmove, __rw_wmemchr, __rw_wmemset, __rw_wmemcmp,
+	__rw_wcslen): Same.
+
+2006-11-29  Martin Sebor  <sebor@roguewave.com>
+
+	* time_put.cpp [MSVC >= 8.0] (__rw_put_time): Used the conforming
+	swprintf() rather than the legacy Microsoft one without the size
+	argument as suggested by the compiler warning.
+
+2006-11-14  Martin Sebor  <sebor@roguewave.com>
+
+	* memattr.cpp (__rw_memattr): Used msync() instead of the unreliable
+	madvise() on IRIX.
+
+2006-10-09  Martin Sebor  <sebor@roguewave.com>
+
+	* wcodecvt.cpp (__rw_libc_do_in): Corrected a typo in conditionally
+	compiled code.
+
+2006-10-09 Farid Zaripov <faridz@kyiv.vdiweb.com>
+
+	STDCXX-93
+	* time_put.cpp (__rw_get_timepunct): Corrected buffer size in
+	wcsftime() calls; _RWSTD_SIZE_MAX changed to size of source
+	string in mbstowcs() calls to deal with MSVC 8.0 CRT
+
+2006-10-05  Martin Sebor  <sebor@roguewave.com>
+
+	* time_put.cpp (__rw_get_time_put_data): Added braces around
+	the initializer of a local array to silence a gcc warning.
+
+2006-10-04 Farid Zaripov <faridz@kyiv.vdiweb.com>
+
+	* exception.cpp [_MSC_VER]: #undefined _RWSTD_NO_VSNPRINTF after
+	#define vsnprintf _vsnprintf
+
+2006-10-03 Farid Zaripov <faridz@kyiv.vdiweb.com>
+
+	Set svn:eol-style property.
+
+2006-09-29 Farid Zaripov <faridz@kyiv.vdiweb.com>
+
+	* _num_put.cc: Updated the licensing header
+	* _select.h: The same
+	* file.cpp: The same
+
+2006-09-29 Farid Zaripov <faridz@kyiv.vdiweb.com>
+
+	* _num_put.cc (__rw_iter_failed): Removed const to resolve
+	ambiguity on MSVC 7.0
+	* _select.h [_RWSTD_NO_CLASS_PARTIAL_SPEC]: Added __rw_is_same
+	for compilers which not support the partial template specialization
+	* file.cpp: Declare fileno() only if it not declared in CRT header,
+	but present in libc
+	* NEW_THROWS.cpp: Returned 1 if operator new doesn't throws
+
+2006-08-28  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-280
+	* wcodecvt.cpp (__rw_libc_do_out): Used wcrtomb instead of wcsrtombs
+	in order to avoid reading past the end of the source sequence when
+	it doesn't contain an embedded NUL.
+
+2006-08-20  Martin Sebor  <sebor@roguewave.com>
+
+	* collate.cpp ("podarray.cc"): Removed #include directive
+	to prevent multiple definition errors.
+	(__rw_pod_array): Moved explicit instantiation...
+	* podarray.h: ...to here.
+
+2006-08-18  Martin Sebor  <sebor@roguewave.com>
+
+	* messages.cpp: Constified locals and sanitized formatting.
+	(_RWSTD_NO_V3_LOCALE): Removed dead macro.
+	(_V3_LOCALE): Replaced with _STD.
+
+2006-08-18  Martin Sebor  <sebor@roguewave.com>
+
+	* collate.cpp (podarray.cc): #included in order to be able
+	to explicitly instantiate __rw_pod_array.
+
+2006-08-14  Martin Sebor  <sebor@roguewave.com>
+
+	* podarray.h: Moved brace closing a namespace to the correct place.
+
+2006-08-14  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-276
+	* podarray.h (__rw_pod_array): Moved member initialization into
+	the body of the ctor in order to prevent HP aCC 3.70 ICE.
+
+2006-08-13  Martin Sebor  <sebor@roguewave.com>
+
+	* exception.cpp: Added/modified comments.
+	* iostream.cpp: Same.
+	* tmpbuf.cpp: Same.
+	* facet.cpp: Same. Removed dead macro.
+	* setlocale.cpp: Same.
+
+2006-08-13  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-274
+	* collate.cpp (__rw_pod_array): Explicitly instantiated for Compaq C++
+	and other compilers that do not do so automatically when a template
+	specialization is used.
+	(_RWSTD_NO_V3_LOCALE, _V3_LOCALE): Removed dead macros.
+	* podarray.h (__rw_pod_array): Added explicit instantiation directive.
+	* ti_podarray.cpp: New file for the explicit instantiation of class
+	__rw_pod_array.
+
+2006-06-26  Anton Pevtsov  <antonp@moscow.vdiweb.com>
+
+	* include/rw/_mutex.h: Added missed _RWSTD_EXPORT directive.
+	* src/exception.cpp: Added missed _RWSTD_EXPORT directive.
+
+2006-06-15  Martin Sebor  <sebor@roguewave.com>
+
+	* atomic-64.s: Updated copyright notice.
+	* atomic.s: Same.
+
+2006-06-14  Martin Sebor  <sebor@roguewave.com>
+
+	* collate.cpp (wcstombs): Decorated with dllimport to silence
+	MSVC warnings about incompatible DLL linkage.
+	* wcodecvt.cpp (wctomb): Same.
+
+2006-06-13  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-200
+	* _localedef.h (__rw_time_t): Changed function argument types
+	to silence Sun C++ 5.8 64-bit conversion/truncation warnings.
+	* punct.cpp (__rw_get_numpunct, __rw_get_moneypunct): Explicitly
+	cast wide expressions to the (narrower) destination type in order
+	to silence Sun C++ 5.8 64-bit truncation warnings.
+	* time_put.cpp (__rw_get_timepunct, __rw_get_zone): Same.
+
+2006-06-01  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-192
+	* atomic.s: Removed .type directives to prevent as errors
+	on Mac OS X.
+
+2006-05-12  Martin Sebor  <sebor@roguewave.com>
+
+	* instance.cpp (__nullref): Increased the size of the array to make
+	big enough to accommodate std::wstring times two with some extra
+	space to spare.
+
+2006-04-20  Martin Sebor  <sebor@roguewave.com>
+
+	* bitset.cpp (__rw_bit_count): Reimplemented to work around
+	an uncharacterized MSVC 8.0 codegen bug on EM64T and for
+	better efficiency (> 2x speedup on ILP32, likely much greater
+	on LP64).
+
+2006-03-28  Martin Sebor  <sebor@roguewave.com>
+
+	* memattr.cpp (__rw_memattr): Checked errno for EFAULT and ENOMEM
+	after caling madvise() on Linux to prevent false negatives when
+	errno is set to EBADF for mapped address ranges not backed by a
+	file.
+
+2006-03-25  Martin Sebor  <sebor@roguewave.com>
+
+	* locale_body.cpp (__rw_cats): Guarded the use of _RWSTD_CAT_5
+	and used _RWSTD_CAT_0 in its place when not #defined (e.g., by
+	dumb windoze).
+
+2006-03-25  Martin Sebor  <sebor@roguewave.com>
+
+	* _defs.h (_RWSTD_VA_COPY): New helper macro.
+	* VA_LIST.cpp(_RWSTD_NO_VA_COPY): New macro #defined in response
+	to the C99 va_copy() macro not being #defined in <stdarg.h>.
+	* exception.cpp (__rw_vfmtwhat): Unconditionally used _RWSTD_VA_COPY().
+	* printf.cpp (rw_vasnprintf): Used _RWSTD_VA_COPY.
+	(rw_sprintf, rw_snprintf): Provided definitions.
+
+2006-03-25  Martin Sebor  <sebor@roguewave.com>
+
+	* memattr.cpp (__rw_memattr): Used mvalid() instead of madvise()
+	on Tru64 UNIX.
+	Removed checks for errno values EFAULT and EINVAL for portability
+	and simply tested for any non-zero errno value.
+
+2006-03-22  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-140
+	* locale_body.cpp (_C_is_managed): Avoided an infinite loop
+	when _RWSTD_CAT_SEP is #defined to the empty string ("").
+
+2006-03-22  Martin Sebor  <sebor@roguewave.com>
+
+	* locale_body.cpp (size_t): Used instead of _RWSTD_SIZE_T for
+	readability.
+	(_V3_LOCALE, _RWSTD_NO_V3_LOCALE): Removed dead macro/guard.
+	Minor formatting adjustments for consistency.
+
+2006-03-18  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-165
+	* num_get.cpp (__rw_get_num): Checked _LONG_DOUBLE in addition to __hpux
+	before using struct long_double in case the struct is not defined e.g.,
+	when using gcc's replacement <stdlib.h> on HP-UX.
+
+2006-03-17  Martin Sebor  <sebor@roguewave.com>
+
+	* exception.cpp (_C_assign): Replaced size_t (~0) with SIZE_MAX
+	to avoid HP aCC remark 4237.
+	(operator=): Avoided the use of a comma expression in the return
+	statement to prevent the bogus HP aCC remark 4284 (operator= does
+	not return reference to *this).
+
+2006-03-17  Martin Sebor  <sebor@roguewave.com>
+
+	* ti_filebuf.cpp (<stdio.h>): Included before <fstream> to get
+	the extended member functions of basic_filebuf that take FILE*
+	as an argument defined and to prevent unsats from programs that
+	do the same thing when extern template is enabled.
+	* ti_filebuf.cpp: Ditto.
+
+2006-03-16  Martin Sebor  <sebor@roguewave.com>
+
+	* memattr.cpp (__rw_memattr): Handled EFAULT (set by HP-UX)
+	in addition to ENOMEM.
+
+2006-03-09  Martin Sebor  <sebor@roguewave.com>
+
+	* collate.cpp (_RWSTD_MB_MAX): Defined to avoid using MB_LEN_MAX
+	in case it's less than 8 (the theoretical maximum for UTF-8) or
+	even less than 6 (the real maximum for UTF-8). Noted by HP aCC
+	6.07.
+	(__rw_get_w_ce_offset, __rw_get_wchar_offset, do_transform): Used
+	_RWSTD_MB_MAX.
+	(__rw_strnxfrm, __rw_wcsnxfrm): Plugged a potential memory leak
+	noted by HP aCC 6.07.
+
+2006-03-06  Martin Sebor  <sebor@roguewave.com>
+
+	* atomic-cxx.S: Changed copyright to the ASF.
+
+2006-03-06  Martin Sebor  <sebor@roguewave.com>
+
+	STDCXX-162
+	* _config.h (_RWSTD_NO_STRING_MUTEX): Removed conditional definition.
+	* _mutex.h (_RWSTD_ATOMIC_OPS): Corrected spelling and simplified the
+	handling of the macro. Handled x86_64 in the same block as IA64.
+	* _strref.h (_RWSTD_NO_STRING_MUTEX): Defined in response to
+	_RWSTD_ATOMIC_OPS being undefined.
+	* atomic.s: Handled __x86_64 (and __x86_64__).
+	* i86_64/atomic.s: AMD64/EM64T implementation.
+
+2006-03-03  Martin Sebor  <sebor@roguewave.com>
+
+	* wcodecvt.cpp (wcrtomb): Corrected declaration.
+
+2006-02-02  Martin Sebor  <sebor@roguewave.com>
+
+	* wcodecvt.cpp [_RWSTD_NO_WCRTOMB] (__rw_libc_do_out): Corrected
+	the spelling of wctomb() in conditionally compiled code.
+
+Updated.
+
 2006-02-01  Martin Sebor  <sebor@roguewave.com>
 
 	* wcodecvt.cpp (__rw_libc_do_out): Removed the RWSTD_WCRTOMB macro and
 	instead explicitly spelled out the code	the macro used to expand to.
 	(__rw_libc_do_unshift): Same.
 	(__rw_libc_do_in): Same for _RWSTD_MBRTOWC().
-	
+
+2006-02-01  Martin Sebor  <sebor@roguewave.com>
+
 	* wctype.cpp (<stdlib.h>): Included for wctomb.
 	(_RWSTD_NO_V3_LOCALE): Removed dead macro.
 	(__rw_toupper): Used _STD instead of _V3_LOCALE.
@@ -16,69 +617,69 @@
 
 2006-01-19  Martin Sebor  <sebor@roguewave.com>
 
-        * string.cpp [_RWSTD_NO_MEMCPY] (__rw_memcpy): Corrected logic
-        errors in conditionally compiled code.
-        [_RWSTD_NO_MEMCHR] (__rw_memchr): Same.
-        [_RWSTD_NO_MEMCMP] (__rw_memcmp): Same.
-        [_RWSTD_NO_STRLEN] (__rw_strlen): Same(!) 
-        [_RWSTD_NO_WMEMCPY] (__rw_wmemcpy): Same.
-        [_RWSTD_NO_WMEMCHR] (__rw_wmemchr): Same.
-        [_RWSTD_NO_WMEMCMP] (__rw_wmemcmp): Same.
-        [_RWSTD_NO_WSTRLEN] (__rw_wcslen): Same.
+	* string.cpp [_RWSTD_NO_MEMCPY] (__rw_memcpy): Corrected logic
+	errors in conditionally compiled code.
+	[_RWSTD_NO_MEMCHR] (__rw_memchr): Same.
+	[_RWSTD_NO_MEMCMP] (__rw_memcmp): Same.
+	[_RWSTD_NO_STRLEN] (__rw_strlen): Same(!) 
+	[_RWSTD_NO_WMEMCPY] (__rw_wmemcpy): Same.
+	[_RWSTD_NO_WMEMCHR] (__rw_wmemchr): Same.
+	[_RWSTD_NO_WMEMCMP] (__rw_wmemcmp): Same.
+	[_RWSTD_NO_WSTRLEN] (__rw_wcslen): Same.
 
 2006-01-19  Martin Sebor  <sebor@roguewave.com>
 
-        * string.cpp [_RWSTD_NO_MEMCPY] (__rw_memcpy): Explicitly cast void*
-        to char* before doing any arithmetic on the value.
-        (__rw_memchr): Same.
-        (__rw_memset): Same.
-        (__rw_memcmp): Same.
-        (__rw_memmove): Same. Added a missing return statement.
-        [_RWSTD_NO_WMEMMOVE] (__rw_wmemmove): Added a missing return statement.
+	* string.cpp [_RWSTD_NO_MEMCPY] (__rw_memcpy): Explicitly cast void*
+	to char* before doing any arithmetic on the value.
+	(__rw_memchr): Same.
+	(__rw_memset): Same.
+	(__rw_memcmp): Same.
+	(__rw_memmove): Same. Added a missing return statement.
+	[_RWSTD_NO_WMEMMOVE] (__rw_wmemmove): Added a missing return statement.
 
 2006-01-19  Martin Sebor  <sebor@roguewave.com>
 
-        * wcodecvt.cpp [_RWSTD_NO_MBTOWC] (mbtowc): Declared when not
-        declared in <stdlib.h> but known to be defined in the libc binary.
-        (do_in, do_out, do_length): Guarded references to mbtowc() with
-        _RWSTD_NO_MBTOWC.
-        [_RWSTD_NO_MBRLEN && _RWSTD_NO_MBLEN] (__rw_libc_mbrlen): Silenced
-        an unused variable warning.
-        (do_unshift): Removed an unnecessary scope resolution operator
-        from a call to mbtowc().
+	* wcodecvt.cpp [_RWSTD_NO_MBTOWC] (mbtowc): Declared when not
+	declared in <stdlib.h> but known to be defined in the libc binary.
+	(do_in, do_out, do_length): Guarded references to mbtowc() with
+	_RWSTD_NO_MBTOWC.
+	[_RWSTD_NO_MBRLEN && _RWSTD_NO_MBLEN] (__rw_libc_mbrlen): Silenced
+	an unused variable warning.
+	(do_unshift): Removed an unnecessary scope resolution operator
+	from a call to mbtowc().
 
 2006-01-16  Martin Sebor  <sebor@roguewave.com>
 
-        STDCXX-104
-        * wcodecvt.cpp (__rw_libc_do_out): Used the _RWSTD_WCSLEN() macro
+	STDCXX-104
+	* wcodecvt.cpp (__rw_libc_do_out): Used the _RWSTD_WCSLEN() macro
         instead of invoking wcslen() directly.
 
 2006-01-14  Martin Sebor  <sebor@roguewave.com>
 
-        * codecvt.cpp (StateT): Moved convenience typedef from __rw_mbsinit
-        to file scope and used it to declare the function's formal argument.
+	* codecvt.cpp (StateT): Moved convenience typedef from __rw_mbsinit
+	to file scope and used it to declare the function's formal argument.
 
 2006-01-14  Martin Sebor  <sebor@roguewave.com>
 
-        * wcodecvt.cpp (StateT): New convenience typedef.
-        (__rw_libstd_do_out): Documented the purpose of dead code
-        and unreachable warnings.
+	* wcodecvt.cpp (StateT): New convenience typedef.
+	(__rw_libstd_do_out): Documented the purpose of dead code
+	and unreachable warnings.
 
 2006-01-12  Martin Sebor  <sebor@roguewave.com>
 
-        * codecvt.cpp: Removed assumptions about _RWSTD_MBSTATE_T being
-        a simple type (not really necessary after r368468 but it doesn't
-        hurt to be extra safe).
-        * wcodecvt.cpp: Same.
+	* codecvt.cpp: Removed assumptions about _RWSTD_MBSTATE_T being
+	a simple type (not really necessary after r368468 but it doesn't
+	hurt to be extra safe).
+	* wcodecvt.cpp: Same.
 
 2006-01-12  Martin Sebor  <sebor@roguewave.com>
 
-        STDCXX-108
-        * TIMEZONE.cpp: New test to determine whether the POSIX timezone
-        variable is declared in <time.h>.
-        * time_put.cpp (__rw_get_zone): Changed to return 0 instead of void
-        on success (and non-zero on error) and handled _RWSTD_NO_TIMEZONE.
-        (__rw_get_time_put_data): Handled __rw_get_zone failure.
+	STDCXX-108
+	* TIMEZONE.cpp: New test to determine whether the POSIX timezone
+	variable is declared in <time.h>.
+	* time_put.cpp (__rw_get_zone): Changed to return 0 instead of void
+	on success (and non-zero on error) and handled _RWSTD_NO_TIMEZONE.
+	(__rw_get_time_put_data): Handled __rw_get_zone failure.
 
 2006-01-11  Andrew Black <ablack@roguewave.com>
 
@@ -355,9 +956,9 @@
 
 2005-07-26  Martin Sebor  <sebor@roguewave.com>
 
-	Set the svn:keywords property and enabled the expansion
-	of the Id keyword.
+	Set the svn:keywords property and enabled the expansion of the Id
+	keyword.
 
-2005-07-18  Martin Sebor  <sebor@roguewave.com>
+2005-07-19  Martin Sebor  <sebor@roguewave.com>
 
 	Initial import of the Rogue Wave C++ Standard library 4.1.2.
diff --git a/src/atomic-cxx.S b/src/atomic-cxx.S
index 8ee2b8f..1bd0519 100644
--- a/src/atomic-cxx.S
+++ b/src/atomic-cxx.S
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2003-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2003-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/atomic.asm b/src/atomic.asm
new file mode 100644
index 0000000..95efcac
--- /dev/null
+++ b/src/atomic.asm
@@ -0,0 +1,36 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; atomic.asm
+;
+; $Id$
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Licensed to the Apache Software  Foundation (ASF) under one or more
+; contributor  license agreements.  See  the NOTICE  file distributed
+; with  this  work  for  additional information  regarding  copyright
+; ownership.   The ASF  licenses this  file to  you under  the Apache
+; License, Version  2.0 (the  "License"); you may  not use  this file
+; except in  compliance with the License.   You may obtain  a copy of
+; the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the  License is distributed on an  "AS IS" BASIS,
+; WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+; implied.   See  the License  for  the  specific language  governing
+; permissions and limitations under the License.
+;
+; Copyright 2003-2006 Rogue Wave Software.
+; 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+ifdef Win32
+  include <i86/atomic.inc>
+elseifdef x64
+  include <i86_64/atomic.inc>
+endif
+
+end
diff --git a/src/atomic.s b/src/atomic.s
index 2a83cd2..c7b516e 100644
--- a/src/atomic.s
+++ b/src/atomic.s
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2003-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2003-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
diff --git a/src/catalog.cpp b/src/catalog.cpp
index 0b6a623..ec64f15 100644
--- a/src/catalog.cpp
+++ b/src/catalog.cpp
@@ -71,12 +71,14 @@
 
   CatVector::size_type __catfind(nl_catd id)
   {
-    CatVector::size_type i = 0;
-    while (i < __rw_catlist.size() && __rw_catlist[i] && __rw_catlist[i]->id() != id)
-      i++;
-    if (!__rw_catlist[i])
-      return __rw_catlist.size();
-    return i;
+    for (CatVector::size_type i = 0;
+         i < __rw_catlist.size() && __rw_catlist[i]; ++i) {
+
+      if (__rw_catlist[i]->id() == id)
+          return i;
+    }
+    
+    return __rw_catlist.size();
   }  
 
 
@@ -95,8 +97,7 @@
 
         if (cat && cat->good()) {
             CatVector::size_type i = 0;
-            while (__rw_catlist[i] != 0)
-                i++;
+            for (; i < __rw_catlist.size() && __rw_catlist[i]; ++i) ;
             if (__rw_catlist.size() == i)
                 __rw_catlist.resize(__rw_catlist.size() * 2,0);
             __rw_catlist[i] = cat;
@@ -135,7 +136,7 @@
     delete __rw_catlist[i];
     __rw_catlist[i] = 0;
     CatVector::size_type j;
-    for (j = i+1; __rw_catlist[j] && j < __rw_catlist.size(); j++)
+    for (j = i+1; j < __rw_catlist.size() && __rw_catlist[j]; j++)
       __rw_catlist[j-1] = __rw_catlist[j];
     if (j < __rw_catlist.size())
       __rw_catlist[j] = 0;
diff --git a/src/codecvt.cpp b/src/codecvt.cpp
index ce0d259..594b83f 100644
--- a/src/codecvt.cpp
+++ b/src/codecvt.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -30,8 +30,6 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 
 // working around a Compaq C++ bug (see PR #26778)
 #if __DECCXX_VER >= 60300000 && __DECCXX_VER < 60400000
@@ -93,12 +91,20 @@
 }   // namespace __rw
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
 
 
 _RW::__rw_facet_id codecvt<char, char, _RWSTD_MBSTATE_T>::id;
 
 
+codecvt<char, char, _RWSTD_MBSTATE_T>::
+codecvt (size_t refs /* = 0 */)
+    : _RW::__rw_facet (refs), _C_always_noconv (-1)
+{
+    // empty
+}
+
+
 /* virtual */ codecvt<char, char, _RWSTD_MBSTATE_T>::~codecvt ()
 {
     // no-op
@@ -259,11 +265,10 @@
 }
 
 
-}   // namespace _V3_LOCALE
+}   // namespace std
 
 #define TARGS_C   <char, char, _RWSTD_MBSTATE_T>
 
 _RWSTD_DEFINE_FACET_FACTORY (static, codecvt, TARGS_C, codecvt);
 _RWSTD_SPECIALIZE_USE_FACET (codecvt);
 
-#endif   // _RWSTD_NO_V3_LOCALE
diff --git a/src/ctype_bits.cpp b/src/ctype_bits.cpp
index f235744..4a6302e 100644
--- a/src/ctype_bits.cpp
+++ b/src/ctype_bits.cpp
@@ -30,12 +30,10 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <loc/_ctype.h>
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
 
 
 _RWSTD_DEFINE_STATIC_CONST (const ctype_base::mask ctype_base::space);
@@ -52,7 +50,5 @@
 
 _RWSTD_DEFINE_STATIC_CONST (const _RWSTD_SIZE_T ctype<char>::table_size);
 
-}   // namespace _V3_LOCALE
 
-
-#endif   // _RWSTD_NO_V3_LOCALE
+}   // namespace std
diff --git a/src/domain_error.cpp b/src/domain_error.cpp
new file mode 100644
index 0000000..3c90904
--- /dev/null
+++ b/src/domain_error.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * domain_error.cpp - definitions of class domain_error members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ domain_error::
+~domain_error () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/export.cpp b/src/export.cpp
index f613cc2..e436dd0 100644
--- a/src/export.cpp
+++ b/src/export.cpp
@@ -127,3 +127,32 @@
 #include "podarray.cc"
 
 #endif   // _RWSTD_NO_EXPORT
+
+// export __rw_atomic_xxx() functions, defined in atomic.asm
+#if defined (_WIN32) && defined (_DLL)
+
+#  if defined (_M_IX86)
+
+#    pragma comment(linker, "/EXPORT:___rw_atomic_add8")
+#    pragma comment(linker, "/EXPORT:___rw_atomic_add16")
+#    pragma comment(linker, "/EXPORT:___rw_atomic_add32")
+#    pragma comment(linker, "/EXPORT:___rw_atomic_xchg8")
+#    pragma comment(linker, "/EXPORT:___rw_atomic_xchg16")
+#    pragma comment(linker, "/EXPORT:___rw_atomic_xchg32")
+
+#  elif defined (_M_X64)
+
+#    pragma comment(linker, "/EXPORT:__rw_atomic_add8")
+#    pragma comment(linker, "/EXPORT:__rw_atomic_add16")
+#    pragma comment(linker, "/EXPORT:__rw_atomic_add32")
+#    pragma comment(linker, "/EXPORT:__rw_atomic_xchg8")
+#    pragma comment(linker, "/EXPORT:__rw_atomic_xchg16")
+#    pragma comment(linker, "/EXPORT:__rw_atomic_xchg32")
+
+#    ifdef _RWSTD_INT64_T
+#      pragma comment(linker, "/EXPORT:__rw_atomic_add64")
+#      pragma comment(linker, "/EXPORT:__rw_atomic_xchg64")
+#    endif   // _RWSTD_INT64_T
+#  endif   // _M_IX86
+
+#endif   // _WIN32 && _DLL
diff --git a/src/facet.cpp b/src/facet.cpp
index 70cd6e9..bc41d5d 100644
--- a/src/facet.cpp
+++ b/src/facet.cpp
@@ -30,30 +30,14 @@
 
 #include <rw/_defs.h>
 
-// unistd.h is included here because of PR #26255
-#ifndef _MSC_VER
-#  include <unistd.h>
-#endif  // _MSC_VER
-
 #include <locale.h>   // for LC_XXX costants
 #include <stdlib.h>   // for bsearch(), getenv(), qsort()
 #include <string.h>   // for memcpy(), strlen()
 
-#include <sys/stat.h>
-
-#ifndef _MSC_VER
-#  include <sys/mman.h>
-#else
-#  include <windows.h>
-#  include <io.h>
-#endif   // _MSC_VER
-
-#include <sys/types.h>
-#include <fcntl.h>
-
 #include <iosfwd>         // for mbstate_t
 
 #include "access.h"
+#include "mman.h"
 
 #include <loc/_facet.h>
 #include <loc/_locale.h>
@@ -102,93 +86,6 @@
 }
 
 
-// maps a named file into memory as shared, read-only, returns
-// the beginning address on success and fills `size' with the
-// size of the file; returns 0 on failure
-static
-void* __rw_mmap (const char* fname, _RWSTD_SIZE_T *size)
-{
-    _RWSTD_ASSERT (0 != fname);
-    _RWSTD_ASSERT (0 != size);
-
-#if !defined (_MSC_VER)
-    struct stat sb;
-    if (stat (fname, &sb) == -1)
-#else
-    struct _stat sb;
-    if (_stat (fname, &sb) == -1)
-#endif
-        return 0;
-
-    *size = sb.st_size;
-
-#if !defined(_MSC_VER)
-    const int fd = open (fname, O_RDONLY);
-
-    if (-1 == fd)
-        return 0;
-
-    // On HPUX systems MAP_SHARED will prevent a second mapping of the same
-    // file if the regions are overlapping; one solution is to make the 
-    // mapping private.
-#if defined(__hpux)
-    void *data = mmap (0, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-#else
-    void *data = mmap (0, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
-#endif // defined(__hpux__)
-
-    close (fd);
-
-#ifndef MAP_FAILED
-#  define MAP_FAILED (void*)-1
-#endif
-
-    if (MAP_FAILED == data)   // failure
-        return 0;
-#else
-    HANDLE mmf = 
-        CreateFile (fname, GENERIC_READ, FILE_SHARE_READ, NULL,
-                    OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-    if (mmf == INVALID_HANDLE_VALUE)
-        return 0;
-                              
-    HANDLE mmfv = 
-        CreateFileMapping (mmf, NULL, PAGE_READONLY, 0, 0, NULL);
-    if (mmfv == INVALID_HANDLE_VALUE) {
-        CloseHandle (mmf);
-        return 0;
-    }
-
-    void * data = 
-        MapViewOfFile (mmfv, FILE_MAP_READ, 0, 0, sb.st_size);
-
-    // The handles can be safely closed
-    CloseHandle (mmf);
-    CloseHandle (mmfv);
-
-#endif  // _MSC_VER
-
-    return data;
-}
-
-static inline 
-void __rw_munmap (const void* pcv, _RWSTD_SIZE_T size)
-{
-    _RWSTD_ASSERT (pcv && size);
-
-        // cast first to void*
-    void* pv = _RWSTD_CONST_CAST (void*, pcv);
-
-    // POSIX munmap() takes a void*, but not all platforms conform
-#ifndef _MSC_VER
-    munmap (_RWSTD_STATIC_CAST (_RWSTD_MUNMAP_ARG1_T, pv), size);
-#else
-    UnmapViewOfFile (pv);
-#endif  // _MSC_VER
-}
-
-
 int __rw_facet::_C_opts = 0
 
 #ifndef _RWSTD_NO_INITIAL_CAT_SEP
diff --git a/src/i86/atomic.inc b/src/i86/atomic.inc
new file mode 100644
index 0000000..2f1682a
--- /dev/null
+++ b/src/i86/atomic.inc
@@ -0,0 +1,176 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; i86/atomic.inc
+;
+; $Id$
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Licensed to the Apache Software  Foundation (ASF) under one or more
+; contributor  license agreements.  See  the NOTICE  file distributed
+; with  this  work  for  additional information  regarding  copyright
+; ownership.   The ASF  licenses this  file to  you under  the Apache
+; License, Version  2.0 (the  "License"); you may  not use  this file
+; except in  compliance with the License.   You may obtain  a copy of
+; the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the  License is distributed on an  "AS IS" BASIS,
+; WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+; implied.   See  the License  for  the  specific language  governing
+; permissions and limitations under the License.
+;
+; Copyright 2003-2006 Rogue Wave Software.
+; 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+                .486
+                .model flat
+                .code
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" char __rw_atomic_xchg8 (char *x, char y);
+;
+; Atomically assigns the 8-bit value y to *x and returns
+; the original (before assignment) 8-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 4
+                public ___rw_atomic_xchg8
+___rw_atomic_xchg8 proc                     ; char (char *x, char y)
+
+arg_x           = dword ptr  4
+arg_y           = byte ptr  8
+                                            
+                mov     ecx, [esp+arg_x]    ; %ecx = x
+                mov     al,  [esp+arg_y]    ; %al = y
+                xchg    al,  [ecx]          ; %al <-> (%ecx)
+                ret                        
+___rw_atomic_xchg8 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" short __rw_atomic_xchg16 (short *x, short y);
+;
+; Atomically assigns the 16-bit value y to *x and returns
+; the original (before assignment) 16-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 4
+                public ___rw_atomic_xchg16
+___rw_atomic_xchg16 proc                    ; short (short *x, short y)
+
+arg_x           = dword ptr  4
+arg_y           = word ptr  8
+                                            
+                mov     ecx, [esp+arg_x]    ; %ecx = x                 
+                mov     ax,  [esp+arg_y]    ; %eax = y                 
+                xchg    ax,  [ecx]          ; %ax <-> (%ecx)           
+                ret
+___rw_atomic_xchg16 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int __rw_atomic_xchg32 (int *x, int y);
+;
+; Atomically assigns the 32-bit value y to *x and returns
+; the original (before assignment) 32-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 4
+                public ___rw_atomic_xchg32
+___rw_atomic_xchg32 proc                    ; int (int *x, int y)
+
+arg_x           = dword ptr  4
+arg_y           = dword ptr  8
+                                            
+                mov     ecx, [esp+arg_x]    ; %ecx = x
+                mov     eax, [esp+arg_y]    ; %eax = y
+                xchg    eax, [ecx]          ; %eax <-> (%ecx)
+                ret
+___rw_atomic_xchg32 endp
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" char __rw_atomic_add8 (char *x, int y);
+;
+; Atomically increments the 8-bit value *x by y and returns
+; the new (after increment) 8-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 4
+                public ___rw_atomic_add8
+___rw_atomic_add8 proc                       ; char (char *dst, int inc)
+
+arg_dst         = dword ptr  4
+arg_inc         = dword ptr  8
+                                           
+                mov     ecx, [esp+arg_dst]   ; %ecx = dst               
+                mov     eax, [esp+arg_inc]   ; %eax = inc               
+                mov     edx, eax           
+
+                lock xadd [ecx], al          ; tmp = *dst;
+                                             ; dst += inc;
+                                             ; %al = tmp                
+
+                add     eax, edx             ; return %eax + inc        
+                ret
+___rw_atomic_add8 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" short __rw_atomic_add16 (short *x, short y);
+;
+; Atomically increments the 16-bit value *x by y and returns
+; the new (after increment) 16-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 4
+                public ___rw_atomic_add16
+___rw_atomic_add16 proc                      ; short (short *dst, short inc)
+
+arg_dst         = dword ptr  4
+arg_inc         = dword ptr  8
+
+                mov     ecx, [esp+arg_dst]   ; %ecx = dst               
+                mov     eax, [esp+arg_inc]   ; %eax = inc               
+                mov     edx, eax           
+                                          
+                lock xadd [ecx], ax          ; tmp = *dst;
+                                             ; dst += inc;
+                                             ; %ax = tmp                
+                                          
+                add     eax, edx             ; return %eax + inc        
+                ret
+___rw_atomic_add16 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int __rw_atomic_add32 (int *x, int y);
+;
+; Atomically increments the 32-bit value *x by y and returns
+; the new (after increment) 32-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 4
+                public ___rw_atomic_add32
+___rw_atomic_add32 proc                      ; int (int *dst, int inc)
+
+arg_dst         = dword ptr  4
+arg_inc         = dword ptr  8
+
+                mov     ecx, [esp+arg_dst]   ; %ecx = dst               
+                mov     edx, [esp+arg_inc]   ; %edx = inc               
+                mov     eax, edx         
+                                        
+                lock xadd [ecx], eax         ; tmp = *dst;
+                                             ; dst += inc;
+                                             ; %eax = tmp                
+                                        
+                add     eax, edx             ; return %eax + inc        
+                ret
+___rw_atomic_add32 endp
diff --git a/src/i86/atomic.s b/src/i86/atomic.s
index 0dda781..99eb39b 100644
--- a/src/i86/atomic.s
+++ b/src/i86/atomic.s
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2003-2006 Rogue Wave Software.
+ * Copyright 2003-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -33,6 +33,14 @@
 #  define TYPE_DIR(ign1, ign2)
 #endif
 
+#if defined (__CYGWIN__)
+   /* on cygwin used COFF object file format
+      C-functions names should prepended by '_' */
+#  define SYMNAME(name)    _##name
+#else
+#  define SYMNAME(name)    name
+#endif
+
     .text
     .align 4
 
@@ -43,13 +51,13 @@
  * the original (before assignment) 8-bit value of *x.
  **************************************************************************/
 
-    .globl __rw_atomic_xchg8
+    .globl SYMNAME (__rw_atomic_xchg8)
     TYPE_DIR (__rw_atomic_xchg8, @function)
 
-__rw_atomic_xchg8:                 /* ; char (char *x, char y)        */
+SYMNAME (__rw_atomic_xchg8):       /* ; char (char *x, char y)        */
     mov           4(%esp), %ecx    /* ; %ecx = x                      */
     movb          8(%esp), %al     /* ; %al = y                       */
-    xchg          %al, (%ecx)      /* ; %al <-> (%ecx)                */
+    xchgb         %al, (%ecx)      /* ; %al <-> (%ecx)                */
     ret
 
 
@@ -60,10 +68,10 @@
  * the original (before assignment) 16-bit value of *x.
  **************************************************************************/
 
-    .globl __rw_atomic_xchg16
+    .globl SYMNAME (__rw_atomic_xchg16)
     TYPE_DIR (__rw_atomic_xchg16, @function)
 
-__rw_atomic_xchg16:                /* ; short (short *x, short y)     */
+SYMNAME (__rw_atomic_xchg16):      /* ; short (short *x, short y)     */
     mov           4(%esp), %ecx    /* ; %ecx = x                      */
     mov           8(%esp), %eax    /* ; %eax = y                      */
     xchgw         %ax, (%ecx)      /* ; %ax <-> (%ecx)                */
@@ -77,10 +85,10 @@
  * the original (before assignment) 32-bit value of *x.
  **************************************************************************/
 
-    .globl __rw_atomic_xchg32
+    .globl SYMNAME (__rw_atomic_xchg32)
     TYPE_DIR (__rw_atomic_xchg32, @function)
 
-__rw_atomic_xchg32:                /* ; int (int *x, int y)           */
+SYMNAME (__rw_atomic_xchg32):      /* ; int (int *x, int y)           */
     movl          4(%esp), %ecx    /* ; %ecx = x                      */
     movl          8(%esp), %eax    /* ; %eax = y                      */
     xchgl         %eax, (%ecx)     /* ; %eax <-> (%ecx)               */
@@ -94,10 +102,10 @@
  * the new (after increment) 8-bit value of *x.
  **************************************************************************/
 
-    .globl __rw_atomic_add8
+    .globl SYMNAME (__rw_atomic_add8)
     TYPE_DIR (__rw_atomic_add8, @function)
 
-__rw_atomic_add8:                  /* ; char (char *dst, int inc)     */
+SYMNAME (__rw_atomic_add8):        /* ; char (char *dst, int inc)     */
     mov            4(%esp), %ecx   /* ; %ecx = dst                    */
     mov            8(%esp), %eax   /* ; %eax = inc                    */
     mov            %eax, %edx      /* ; */
@@ -118,10 +126,10 @@
  * the new (after increment) 16-bit value of *x.
  **************************************************************************/
 
-     .globl __rw_atomic_add16
+     .globl SYMNAME (__rw_atomic_add16)
     TYPE_DIR (__rw_atomic_add16, @function)
 
-__rw_atomic_add16:                 /* ; long (long *dst, long inc)    */
+SYMNAME (__rw_atomic_add16):       /* ; short (short *dst, short inc) */
     mov            4(%esp), %ecx   /* ; %ecx = dst                    */
     mov            8(%esp), %eax   /* ; %eax = inc                    */
     mov            %eax, %edx      /* ; */
@@ -129,7 +137,7 @@
     lock
     xaddw          %ax, (%ecx)     /* ; tmp = *dst;
                                       ; dst += inc;
-                                      ; eax = tmp                     */
+                                      ; %ax = tmp                     */
 
     add            %edx, %eax      /* ; return %eax + inc             */
     ret
@@ -142,10 +150,10 @@
  * the new (after increment) 32-bit value of *x.
  **************************************************************************/
 
-    .globl __rw_atomic_add32
+    .globl SYMNAME (__rw_atomic_add32)
     TYPE_DIR (__rw_atomic_add32, @function)
 
-__rw_atomic_add32:                 /* ; long (long *dst, long inc)    */
+SYMNAME (__rw_atomic_add32):       /* ; int (int *dst, int inc)       */
     movl           4(%esp), %ecx   /* ; %ecx = dst                    */
     movl           8(%esp), %edx   /* ; %edx = inc                    */
     movl           %edx, %eax      /* ; */
diff --git a/src/i86_64/atomic.inc b/src/i86_64/atomic.inc
new file mode 100644
index 0000000..5cc5ff3
--- /dev/null
+++ b/src/i86_64/atomic.inc
@@ -0,0 +1,184 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; i86_64/atomic.inc
+;
+; $Id$
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;
+; Licensed to the Apache Software  Foundation (ASF) under one or more
+; contributor  license agreements.  See  the NOTICE  file distributed
+; with  this  work  for  additional information  regarding  copyright
+; ownership.   The ASF  licenses this  file to  you under  the Apache
+; License, Version  2.0 (the  "License"); you may  not use  this file
+; except in  compliance with the License.   You may obtain  a copy of
+; the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the  License is distributed on an  "AS IS" BASIS,
+; WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+; implied.   See  the License  for  the  specific language  governing
+; permissions and limitations under the License.
+;
+; Copyright 2003-2006 Rogue Wave Software.
+; 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+                .code
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int8_t __rw_atomic_xchg8 (int8_t *x, int8_t y);
+;
+; Atomically assigns the 8-bit value y to *x and returns
+; the original (before assignment) 8-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_xchg8
+__rw_atomic_xchg8 proc                    ; int8_t (int8_t *x, int8_t y)
+                                          ; %rcx = x
+                mov     al, dl            ; %al = y 
+                xchg    al, [rcx]         ; %al <-> (%rcx)
+                ret
+__rw_atomic_xchg8 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int16_t __rw_atomic_xchg16 (int16_t *x, int16_t y);
+;
+; Atomically assigns the 16-bit value y to *x and returns
+; the original (before assignment) 16-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_xchg16
+__rw_atomic_xchg16 proc                   ; int16_t (int16_t *x, int16_t y)
+                                          ; %rcx = x
+                mov     ax, dx            ; %ax = y
+                xchg    ax, [rcx]         ; %ax <-> (%rcx)
+                ret
+__rw_atomic_xchg16 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int32_t __rw_atomic_xchg32 (int32_t *x, int32_t y);
+;
+; Atomically assigns the 32-bit value y to *x and returns
+; the original (before assignment) 32-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_xchg32
+__rw_atomic_xchg32 proc                   ; int32_t (int32_t *x, int32_t y)
+                                          ; %rcx = x
+                mov     eax, edx          ; %eax = y
+                xchg    eax, [rcx]        ; %eax <-> (%rcx)
+                ret
+__rw_atomic_xchg32 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int32_t __rw_atomic_xchg64 (int64_t *x, int64_t y);
+;
+; Atomically assigns the 64-bit value y to *x and returns
+; the original (before assignment) 64-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_xchg64
+__rw_atomic_xchg64 proc                   ; int64_t (int64_t *x, int64_t y)
+                                          ; %rcx = x
+                mov     rax, rdx          ; %rax = y
+                xchg    rax, [rcx]        ; %rax <-> (%rcx)
+                ret
+__rw_atomic_xchg64 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int8_t __rw_atomic_add8 (int8_t *x, int8_t y);
+;
+; Atomically increments the 8-bit value *x by y and returns
+; the new (after increment) 8-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_add8
+__rw_atomic_add8 proc                     ; int8_t (int8_t *dst, int8_t inc)
+                                          ; %rcx = dst
+                mov     eax, edx          ; %eax = inc
+
+                lock xadd [rcx], al       ; tmp = *dst
+                                          ; dst += inc      
+                                          ; %al = tmp       
+                add     eax, edx          ; return %al + inc
+                ret
+__rw_atomic_add8 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int16_t __rw_atomic_add16 (int16_t *x, int16_t y);
+;
+; Atomically increments the 16-bit value *x by y and returns
+; the new (after increment) 16-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_add16
+__rw_atomic_add16 proc                    ; int16_t (int16_t *dst, int16_t inc)
+                                          ; %rcx = dst
+                mov     ax,  dx           ; %ax = inc 
+
+                lock xadd [rcx], ax       ; tmp = *dst
+                                          ; dst += inc
+                                          ; eax = tmp 
+
+                add     ax,  dx           ; return %ax + inc
+                ret
+__rw_atomic_add16 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int32_t __rw_atomic_add32 (int32_t *x, int32_t y);
+;
+; Atomically increments the 32-bit value *x by y and returns
+; the new (after increment) 32-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_add32
+__rw_atomic_add32 proc                    ; int32_t (int32_t *dst, int32_t inc)
+                                          ; %rcx = dst
+                mov     eax, edx          ; %eax = inc
+
+                lock xadd [rcx], eax      ; tmp = *dst
+                                          ; dst += inc
+                                          ; %eax = tmp
+
+                add     eax, edx          ; return %eax + inc
+                ret
+__rw_atomic_add32 endp
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; extern "C" int64_t __rw_atomic_add64 (int64_t *x, int64_t y);
+;
+; Atomically increments the 32-bit value *x by y and returns
+; the new (after increment) 32-bit value of *x.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+                align 16
+                public __rw_atomic_add64
+__rw_atomic_add64 proc                    ; int64_t (int64_t *dst, int64_t inc)
+                                          ; %rcx = dst
+                mov     rax, rdx          ; %eax = inc
+
+                lock xadd [rcx], rax      ; tmp = *dst
+                                          ; dst += inc
+                                          ; %eax = tmp
+
+                add     rax, rdx          ; return %eax + inc
+                ret
+__rw_atomic_add64 endp
diff --git a/src/i86_64/atomic.s b/src/i86_64/atomic.s
index 290f8c5..e0f37c2 100644
--- a/src/i86_64/atomic.s
+++ b/src/i86_64/atomic.s
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2005-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2005-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -55,7 +56,7 @@
     .type __rw_atomic_xchg16, @function
 __rw_atomic_xchg16:                /* ; int16_t (int16_t *x, int16_t y) */
     movq          %rdi, %rcx       /* ; %rcx = x                        */
-    movw          %si,  %ax        /* ; %eax = y                        */
+    movw          %si,  %ax        /* ; %ax = y                         */
     xchgw         %ax, (%rcx)      /* ; %ax <-> (%rcx)                  */
     ret
 
@@ -131,7 +132,7 @@
     lock                           /* ; lock the bus                        */
     xaddw          %ax, (%rcx)     /* ; tmp = *dst                          */
                                    /* ; dst += inc                          */
-                                   /* ; eax = tmp                           */
+                                   /* ; %ax = tmp                            */
 
     addw           %dx,  %ax       /* ; return %ax + inc                    */
     ret
@@ -161,7 +162,7 @@
 
 
 /***************************************************************************
- * extern "C" int64_t __rw_atomic_add32 (int64_t *x, int64_t y);
+ * extern "C" int64_t __rw_atomic_add64 (int64_t *x, int64_t y);
  *
  * Atomically increments the 32-bit value *x by y and returns
  * the new (after increment) 32-bit value of *x.
@@ -177,7 +178,7 @@
     lock                           /* ; lock the bus                        */
     xaddq          %rax, (%rcx)    /* ; tmp = *dst                          */
                                    /* ; dst += inc                          */
-                                   /* ; %eax = tmp                          */
+                                   /* ; %rax = tmp                          */
 
-    addq           %rdx, %rax      /* ; return %eax + inc                   */
+    addq           %rdx, %rax      /* ; return %rax + inc                   */
     ret
diff --git a/src/ia64/atomic-64.s b/src/ia64/atomic-64.s
index 7248921..537bab1 100644
--- a/src/ia64/atomic-64.s
+++ b/src/ia64/atomic-64.s
@@ -1,27 +1,28 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-// atomic-ia64.s
+// ia64/atomic-ia64.s
 //
 // $Id$
 //
 ////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2005-2006 The Apache Software Foundation or its licensors,
-// as applicable.
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
 //
-// Copyright 2003-2006 Rogue Wave Software.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+//
+// Copyright 2003-2006 Rogue Wave Software.
 //
 ////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/ia64/atomic.s b/src/ia64/atomic.s
index f304722..0831c51 100644
--- a/src/ia64/atomic.s
+++ b/src/ia64/atomic.s
@@ -1,27 +1,28 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-// atomic-ia64-32.s
+// ia64/atomic.s
 //
 // $Id$
 //
 ////////////////////////////////////////////////////////////////////////////
 //
-// Copyright 2005-2006 The Apache Software Foundation or its licensors,
-// as applicable.
+// Licensed to the Apache Software  Foundation (ASF) under one or more
+// contributor  license agreements.  See  the NOTICE  file distributed
+// with  this  work  for  additional information  regarding  copyright
+// ownership.   The ASF  licenses this  file to  you under  the Apache
+// License, Version  2.0 (the  "License"); you may  not use  this file
+// except in  compliance with the License.   You may obtain  a copy of
+// the License at
 //
-// Copyright 2003-2006 Rogue Wave Software.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
+// http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+// distributed under the  License is distributed on an  "AS IS" BASIS,
+// WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+// implied.   See  the License  for  the  specific language  governing
+// permissions and limitations under the License.
+//
+// Copyright 2003-2006 Rogue Wave Software.
 //
 ////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/invalid_argument.cpp b/src/invalid_argument.cpp
new file mode 100644
index 0000000..427f9b5
--- /dev/null
+++ b/src/invalid_argument.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * invalid_argument.cpp - definitions of class invalid_argument members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ invalid_argument::
+~invalid_argument () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/iso2022.cpp b/src/iso2022.cpp
index d1c3ef8..d00894a 100644
--- a/src/iso2022.cpp
+++ b/src/iso2022.cpp
@@ -30,8 +30,6 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <string.h>     // for strxxx()
 #include <iosfwd>       // for mbstate_t
 
@@ -123,9 +121,9 @@
 #endif
 
 
-#define CODECVT_ERROR   _V3_LOCALE::codecvt_base::error
-#define CODECVT_OK      _V3_LOCALE::codecvt_base::ok
-#define CODECVT_PARTIAL _V3_LOCALE::codecvt_base::partial
+#define CODECVT_ERROR   _STD::codecvt_base::error
+#define CODECVT_OK      _STD::codecvt_base::ok
+#define CODECVT_PARTIAL _STD::codecvt_base::partial
 
 
 _RWSTD_NAMESPACE (__rw) {
@@ -661,7 +659,7 @@
 // given by the last parameter and is currently one of the following:
 //   - ISO_2022-JP
 //   - ISO_2022-JP2
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
 __rw_iso2022jp_designate (__rw_iso2022_state_t& state,
                           char*&                to,
                           char*                 to_end,
@@ -779,7 +777,7 @@
 // Upon entry:
 //   - from  - points to the first byte after the ESCAPE_CHAR indicator;
 //   - enc   - encoding type.
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
 __rw_iso2022_escape (__rw_iso2022_state_t& state,
                      const char*&          from,
                      const char*           from_end,
@@ -861,10 +859,10 @@
 // ISO-2022-JP conversion from ANSI_X3.4-1968
 // Convert one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
+static _STD::codecvt_base::result
 __rw_ascii_to_iso2022 (__rw_iso2022_state_t& state,
                        const char*&          from,
                        const char*           from_end,
@@ -879,7 +877,7 @@
     _RWSTD_ASSERT (from_end-from >= int(width));
     _RWSTD_UNUSED (from_end);
 
-    _V3_LOCALE::codecvt_base::result ret;
+    _STD::codecvt_base::result ret;
 
     // check the designation sequence
     if (state.g_map [0] != reg) {
@@ -916,10 +914,10 @@
 // ISO-2022-JP conversion from KSC5601-1987
 // Convert one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
+static _STD::codecvt_base::result
 __rw_ksc5601_to_iso2022 (__rw_iso2022_state_t& state,
                          const char*&        from,
                          const char*         from_end,
@@ -934,7 +932,7 @@
     _RWSTD_ASSERT(from_end-from >= int(width));
     _RWSTD_UNUSED(from_end);
 
-    _V3_LOCALE::codecvt_base::result ret;
+    _STD::codecvt_base::result ret;
 
     // check the designation sequence
     if (state.g_map [0] != reg) {
@@ -971,10 +969,10 @@
 // ISO-2022-JP conversion from GB2312-1980
 // Convert one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
+static _STD::codecvt_base::result
 __rw_gb2312_to_iso2022 (__rw_iso2022_state_t& state,
                         const char*&          from,
                         const char*           from_end,
@@ -989,7 +987,7 @@
     _RWSTD_ASSERT(from_end-from >= int(width));
     _RWSTD_UNUSED(from_end);
 
-    _V3_LOCALE::codecvt_base::result ret;
+    _STD::codecvt_base::result ret;
 
     // check the designation sequence
     if (state.g_map [0] != reg) {
@@ -1026,10 +1024,10 @@
 // ISO-2022-JP conversion from ISO-8859-7
 // Convert one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
+static _STD::codecvt_base::result
 __rw_iso88597_to_iso2022 (__rw_iso2022_state_t& state,
                           const char*&          from,
                           const char*           from_end,
@@ -1044,7 +1042,7 @@
     _RWSTD_ASSERT(from_end-from >= int(width2));
     _RWSTD_UNUSED(from_end);
 
-    _V3_LOCALE::codecvt_base::result ret;
+    _STD::codecvt_base::result ret;
 
     // always call designate for this one; designation will at least insert a
     // single shift function in the destination buffer
@@ -1073,10 +1071,10 @@
 // ISO-2022-JP conversion from ISO-8859-1
 // Convert one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
+static _STD::codecvt_base::result
 __rw_iso88591_to_iso2022 (__rw_iso2022_state_t& state,
                           const char*&          from,
                           const char*           from_end,
@@ -1091,7 +1089,7 @@
     _RWSTD_ASSERT(from_end-from >= int(width2));
     _RWSTD_UNUSED(from_end);
 
-    _V3_LOCALE::codecvt_base::result ret;
+    _STD::codecvt_base::result ret;
 
     // always call designate for this one; designation will at least insert a
     // single shift function in the destination buffer
@@ -1120,10 +1118,10 @@
 // ISO-2022-JP conversion from packed EUC-JP
 // Convert one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
+static _STD::codecvt_base::result
 __rw_eucjp_to_iso2022 (__rw_iso2022_state_t& state,
                        const char*&          from,
                        const char*           from_end,
@@ -1134,7 +1132,7 @@
     int width = 0;
     unsigned char reg = 0;
 
-    _V3_LOCALE::codecvt_base::result ret;
+    _STD::codecvt_base::result ret;
 
     // convert and store the encoding
     unsigned char c = *_RWSTD_REINTERPRET_CAST(const unsigned char*, from);
@@ -1204,18 +1202,18 @@
 // ISO-2022-JP conversion to GB2312-1980
 // Converts one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
 static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022_to_gb2312 (const char*& from,
                         const char*  from_end,
                         char*&       to,
                         int          /* reg */,
                         int          /* enc */)
 {
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
 
     if (from_end - from < GB2312_CHAR_LEN)
         return res;
@@ -1231,18 +1229,18 @@
 // ISO-2022-JP conversion to KSC2312
 // Converts one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
 static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022_to_ksc5601 (const char*& from,
                          const char*  from_end,
                          char*&       to,
                          int          /* reg */,
                          int          /* enc */)
 {
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
 
     if (from_end - from < KSC5601_CHAR_LEN)
         return res;
@@ -1258,18 +1256,18 @@
 // ISO-2022-JP conversion to ISO-8859-1
 // Converts one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
 static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022_to_iso88591 (const char*& from,
                           const char*  from_end,
                           char*&       to,
                           int          /* reg */,
                           int          /* enc */)
 {
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
 
     if (from_end - from < ISO_8859_1_CHAR_LEN)
         return res;
@@ -1284,18 +1282,18 @@
 // ISO-2022-JP conversion to ISO-8859-7
 // Converts one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
 static inline
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022_to_iso88597 (const char*& from,
                           const char*  from_end,
                           char*&       to,
                           int          /* reg */,
                           int          /* enc */)
 {
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
 
     if (from_end - from < ISO_8859_7_CHAR_LEN)
         return res;
@@ -1310,10 +1308,10 @@
 // ISO-2022-JP conversion to packed EUC-JP
 // Converts one character.
 // Returns:
-//    _V3_LOCALE::codecvt_base::ok      in case the conversion succeeded
-//    _V3_LOCALE::codecvt_base::partial for partial conversions
-//    _V3_LOCALE::codecvt_base::error   erroneous sequence
-static _V3_LOCALE::codecvt_base::result
+//    std::codecvt_base::ok      in case the conversion succeeded
+//    std::codecvt_base::partial for partial conversions
+//    std::codecvt_base::error   erroneous sequence
+static _STD::codecvt_base::result
 __rw_iso2022_to_eucjp (const char*&          from,
                        const char*           from_end,
                        char*&                to,
@@ -1327,7 +1325,7 @@
     if (from_end - from < width)
         return CODECVT_OK;
 
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
 
     // from either the ANSI_X3.4-1968 or JIS X 0201 Roman or JIS X 0201 Kana
     switch (reg) {
@@ -1382,7 +1380,7 @@
 //  Converts  one  character  from  the  external  representation  to  the
 //  intermediary encoding  that is later  used in retrieving  the internal
 //  representation of that character
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
 __rw_iso2022_to_interm (__rw_iso2022_state_t& state,
                         const char*&          from,
                         const char*           from_end,
@@ -1390,7 +1388,7 @@
                         unsigned char&        reg,
                         int                   enc)
 {
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
 
     bool first = true;
     for (; *from == ESCAPE_CHAR; first = false) {
@@ -1458,7 +1456,7 @@
 }
 
 
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
 __rw_ucs4_to_eucjp (const wchar_t*& from,
                     const wchar_t*  from_end,
                     char*&          to,
@@ -1594,7 +1592,7 @@
 
 
 // does the conversion of one character to internal representation
-static _V3_LOCALE::codecvt_base::result
+static _STD::codecvt_base::result
 __rw_iso2022_to_ucs4 (_RWSTD_MBSTATE_T&     state,
                       __rw_iso2022_state_t* iso_state,
                       const char*&          from,
@@ -1603,7 +1601,7 @@
                       wchar_t*              /* to_end */,
                       int                   enc)
 {
-    _V3_LOCALE::codecvt_base::result res;
+    _STD::codecvt_base::result res;
 
     // the registration code of the character set
     unsigned char reg   = iso_state->g_map [0];
@@ -1695,7 +1693,7 @@
 /****************************************************************************/
 
 // Conversion from ISO-2022-JP to UCS-4
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp_do_in (_RWSTD_MBSTATE_T& state,
                       const char*&      from,
                       const char*       from_end,
@@ -1716,7 +1714,7 @@
 
     while (from_end - from && to_end - to) {
         // operation result
-        _V3_LOCALE::codecvt_base::result res;
+        _STD::codecvt_base::result res;
         res = __rw_iso2022_to_ucs4 (state, iso_state, from_next,
                                     from_end, to_next, to_end, iso2022_jp);
 
@@ -1740,7 +1738,7 @@
 
 
 // Conversion from UCS-4 to ISO-2022-JP
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp_do_out (_RWSTD_MBSTATE_T& state,
                        const wchar_t*&   from,
                        const wchar_t*    from_end,
@@ -1771,7 +1769,7 @@
     // Loop until the source buffer is consumed, an error occurs, or
     // the destination buffer reaches capacity
     while (from_end - from && to_end - to) {
-        _V3_LOCALE::codecvt_base::result res;
+        _STD::codecvt_base::result res;
 
         // convert the UCS-4 value to EUC-JP
         const wchar_t* ps   = from;
@@ -1817,11 +1815,11 @@
 }
 
 
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp_do_unshift (_RWSTD_MBSTATE_T& state,
                            char*& to, char* to_end)
 {
-    _V3_LOCALE::codecvt_base::result res =
+    _STD::codecvt_base::result res =
         CODECVT_ERROR;
 
     // the iso2022 state
@@ -1861,7 +1859,7 @@
         return CODECVT_ERROR;
 
     int ret = 0;
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
     while (max && from_end - from) {
         while (*from == ESCAPE_CHAR)
 
@@ -1911,7 +1909,7 @@
 /****************************************************************************/
 
 // Conversion from ISO-2022-JP to UCS-4
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp2_do_in (_RWSTD_MBSTATE_T& state,
                        const char*&      from,
                        const char*       from_end,
@@ -1933,7 +1931,7 @@
         wchar_t*    to_next   = to;
 
         // operation result
-        _V3_LOCALE::codecvt_base::result res;
+        _STD::codecvt_base::result res;
         res = __rw_iso2022_to_ucs4 (state, iso_state, from_next,
                                     from_end, to_next, to_end, iso2022_jp2);
 
@@ -1957,7 +1955,7 @@
 
 
 // Conversion from UCS-4 to ISO-2022-JP-2
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp2_do_out (_RWSTD_MBSTATE_T& state,
                        const wchar_t*&    from,
                        const wchar_t*     from_end,
@@ -1977,7 +1975,7 @@
     // Loop until the source buffer is consumed, an error occurs, or
     // the destination buffer reaches capacity
     while (from_end - from && to_end - to) {
-        _V3_LOCALE::codecvt_base::result res;
+        _STD::codecvt_base::result res;
 
         // convert the UCS-4 value to intermediary encoding
         const wchar_t* ps   = from;
@@ -2058,7 +2056,7 @@
 }
 
 
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp2_do_unshift (_RWSTD_MBSTATE_T& state,
                             char*& to, char* to_end)
 {
@@ -2081,7 +2079,7 @@
         return CODECVT_ERROR;
 
     int ret = 0;
-    _V3_LOCALE::codecvt_base::result res = CODECVT_OK;
+    _STD::codecvt_base::result res = CODECVT_OK;
 
     while (max && from_end - from) {
 
@@ -2153,5 +2151,3 @@
 }
 
 }   // namespace __rw
-
-#endif   // _RWSTD_NO_V3_LOCALE
diff --git a/src/iso2022.h b/src/iso2022.h
index c84adb7..0c1c416 100644
--- a/src/iso2022.h
+++ b/src/iso2022.h
@@ -54,17 +54,17 @@
 
 
 // Conversions for ISO-2022-JP
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp_do_in (_RWSTD_MBSTATE_T&,
                       const char*&, const char*,
                       wchar_t*&, wchar_t*);
 
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp_do_out (_RWSTD_MBSTATE_T&,
                        const wchar_t*&, const wchar_t*,
                        char*&, char*);
 
-_V3_LOCALE::codecvt_base::result 
+_STD::codecvt_base::result 
 __rw_iso2022jp_do_unshift (_RWSTD_MBSTATE_T&, char*&, char*);
 
 int  __rw_iso2022jp_do_encoding ();
@@ -78,17 +78,17 @@
 
 
 // Conversions for ISO-2022-JP-2
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp2_do_in (_RWSTD_MBSTATE_T&,
                        const char*&, const char*,
                        wchar_t*&, wchar_t*);
 
-_V3_LOCALE::codecvt_base::result
+_STD::codecvt_base::result
 __rw_iso2022jp2_do_out (_RWSTD_MBSTATE_T&,
                        const wchar_t*&, const wchar_t*,
                        char*&, char*);
 
-_V3_LOCALE::codecvt_base::result 
+_STD::codecvt_base::result 
 __rw_iso2022jp2_do_unshift (_RWSTD_MBSTATE_T&, char*&, char*);
 
 int  __rw_iso2022jp2_do_encoding  ();
diff --git a/src/length_error.cpp b/src/length_error.cpp
new file mode 100644
index 0000000..85a1b5e
--- /dev/null
+++ b/src/length_error.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * length_error.cpp - definitions of class length_error members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ length_error::
+~length_error () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/limits_bits.cpp b/src/limits_bits.cpp
index 70ffe52..07af06f 100644
--- a/src/limits_bits.cpp
+++ b/src/limits_bits.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -30,6 +30,11 @@
 
 #include <float.h>    // for INFINITY, NAN
 #include <stdlib.h>   // for atof()
+
+// must not #include <limits> to avoid colliding with symbols
+// declared there with a different type than what they are
+// defined with here
+// #include <limits>
                        
 #include <rw/_defs.h>  
                        
@@ -42,127 +47,107 @@
 #    error one of _RWSTD_NO_INFINITY and _RWSTD_DBL_INF_BITS must be #defined
 #  endif
 
-// infinity computed at config time
-static const union {
-    char _C_bits [sizeof (double)];
-    double _C_val;
-} __rw_dbl_inf_bits = { _RWSTD_DBL_INF_BITS };
 
-_RWSTD_EXPORT extern const double __rw_dbl_infinity = __rw_dbl_inf_bits._C_val;
-
-static const union {
-    char _C_bits [sizeof (float)];
+union _FltBits {
+    char  _C_bits [sizeof (float)];
     float _C_val;
-} __rw_flt_inf_bits = { _RWSTD_FLT_INF_BITS };
+};
 
-_RWSTD_EXPORT extern const float __rw_flt_infinity = __rw_flt_inf_bits._C_val;
+
+union _DblBits {
+    char   _C_bits [sizeof (double)];
+    double _C_val;
+};
 
 
 #  ifndef _RWSTD_NO_LONG_DOUBLE
 
-static const union {
-    char _C_bits [sizeof (long double)];
+union _LDblBits {
+    char        _C_bits [sizeof (long double)];
     long double _C_val;
-} __rw_ldbl_inf_bits = { _RWSTD_LDBL_INF_BITS };
+};
+
+#  endif   // _RWSTD_NO_LONG_DOUBLE
+
+extern "C" {
+
+// The constants below are declared in <limits> but with a different
+// type. C linkage is used to defeat MSVC and other "clever" compilers
+// that mangle the type of objects into their names.
+
+// infinity computed at config time
+_RWSTD_EXPORT extern const _DblBits
+__rw_dbl_infinity = { _RWSTD_DBL_INF_BITS };
 
 
-_RWSTD_EXPORT extern const long double
-__rw_ldbl_infinity = __rw_ldbl_inf_bits._C_val;
+_RWSTD_EXPORT extern const _FltBits
+__rw_flt_infinity = { _RWSTD_FLT_INF_BITS };
+
+
+#  ifndef _RWSTD_NO_LONG_DOUBLE
+
+_RWSTD_EXPORT extern const _LDblBits
+__rw_ldbl_infinity = { _RWSTD_LDBL_INF_BITS };
+
 
 #  endif   // _RWSTD_NO_LONG_DOUBLE
 
 
 // quiet NaN computed at config time
-static const union {
-    char _C_bits [sizeof (double)];
-    double _C_val;
-} __rw_dbl_qNaN_bits = { _RWSTD_DBL_QNAN_BITS };
+_RWSTD_EXPORT extern const _DblBits
+__rw_dbl_qNaN = { _RWSTD_DBL_QNAN_BITS };
 
-_RWSTD_EXPORT extern const double __rw_dbl_qNaN  = __rw_dbl_qNaN_bits._C_val;
 
-static const union {
-    char _C_bits [sizeof (float)];
-    float _C_val;
-} __rw_flt_qNaN_bits = { _RWSTD_FLT_QNAN_BITS };
-
-_RWSTD_EXPORT extern const float __rw_flt_qNaN  = __rw_flt_qNaN_bits._C_val;
+_RWSTD_EXPORT extern const _FltBits
+__rw_flt_qNaN = { _RWSTD_FLT_QNAN_BITS };
 
 
 #  ifndef _RWSTD_NO_LONG_DOUBLE
 
-static const union {
-    char _C_bits [sizeof (long double)];
-    long double _C_val;
-} __rw_ldbl_qNaN_bits = { _RWSTD_LDBL_QNAN_BITS };
+_RWSTD_EXPORT extern const _LDblBits
+__rw_ldbl_qNaN = { _RWSTD_LDBL_QNAN_BITS };
 
 
-_RWSTD_EXPORT extern const long double
-__rw_ldbl_qNaN = __rw_ldbl_qNaN_bits._C_val;
-
 #  endif   // _RWSTD_NO_LONG_DOUBLE
 
 
 // signaling NaN computed at config time
-static const union {
-    char _C_bits [sizeof (double)];
-    double _C_val;
-} __rw_dbl_sNaN_bits = { _RWSTD_DBL_SNAN_BITS };
+_RWSTD_EXPORT extern const _DblBits
+__rw_dbl_sNaN = { _RWSTD_DBL_SNAN_BITS };
 
-_RWSTD_EXPORT extern const double __rw_dbl_sNaN  = __rw_dbl_sNaN_bits._C_val;
 
-static const union {
-    char _C_bits [sizeof (float)];
-    float _C_val;
-} __rw_flt_sNaN_bits = { _RWSTD_FLT_SNAN_BITS };
-
-_RWSTD_EXPORT extern const float __rw_flt_sNaN  = __rw_flt_sNaN_bits._C_val;
+_RWSTD_EXPORT extern const _FltBits
+__rw_flt_sNaN = { _RWSTD_FLT_SNAN_BITS };
 
 
 #  ifndef _RWSTD_NO_LONG_DOUBLE
 
-static const union {
-    char _C_bits [sizeof (long double)];
-    long double _C_val;
-} __rw_ldbl_sNaN_bits = { _RWSTD_LDBL_SNAN_BITS };
+_RWSTD_EXPORT extern const _LDblBits
+__rw_ldbl_sNaN = { _RWSTD_LDBL_SNAN_BITS };
 
 
-_RWSTD_EXPORT extern const long double
-__rw_ldbl_sNaN = __rw_ldbl_sNaN_bits._C_val;
-
 #  endif   // _RWSTD_NO_LONG_DOUBLE
 
 
 // denormalized minima computed at config time
-static const union {
-    char _C_bits [sizeof (double)];
-    double _C_val;
-} __rw_dbl_denorm_min_bits = { _RWSTD_DBL_DENORM_MIN_BITS };
+_RWSTD_EXPORT extern const _DblBits
+__rw_dbl_denorm_min = { _RWSTD_DBL_DENORM_MIN_BITS };
 
-_RWSTD_EXPORT extern const double
-__rw_dbl_denorm_min = __rw_dbl_denorm_min_bits._C_val;
 
-static const union {
-    char _C_bits [sizeof (float)];
-    float _C_val;
-} __rw_flt_denorm_min_bits = { _RWSTD_FLT_DENORM_MIN_BITS };
-
-_RWSTD_EXPORT extern const float
-__rw_flt_denorm_min = __rw_flt_denorm_min_bits._C_val;
+_RWSTD_EXPORT extern const _FltBits
+__rw_flt_denorm_min = { _RWSTD_FLT_DENORM_MIN_BITS };
 
 
 #  ifndef _RWSTD_NO_LONG_DOUBLE
 
-static const union {
-    char _C_bits [sizeof (long double)];
-    long double _C_val;
-} __rw_ldbl_denorm_min_bits = { _RWSTD_LDBL_DENORM_MIN_BITS };
+_RWSTD_EXPORT extern const _LDblBits
+__rw_ldbl_denorm_min = { _RWSTD_LDBL_DENORM_MIN_BITS };
 
 
-_RWSTD_EXPORT extern const long double
-__rw_ldbl_denorm_min = __rw_ldbl_denorm_min_bits._C_val;
-
 #  endif   // _RWSTD_NO_LONG_DOUBLE
 
+}   // extern "C"
+
 #else   // if defined (_RWSTD_NO_INFINITY)
 
 // as the last resort compute values at dynamic initialization time
diff --git a/src/locale_bits.cpp b/src/locale_bits.cpp
index 239377e..740ca69 100644
--- a/src/locale_bits.cpp
+++ b/src/locale_bits.cpp
@@ -30,12 +30,10 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <loc/_locale.h>
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
+_RWSTD_NAMESPACE (std) { 
 
 
 _RWSTD_DEFINE_STATIC_CONST (const locale::category locale::none);
@@ -48,7 +46,4 @@
 _RWSTD_DEFINE_STATIC_CONST (const locale::category locale::all);
 
 
-}   // namespace _V3_LOCALE
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
+}   // namespace std
diff --git a/src/locale_body.cpp b/src/locale_body.cpp
index 2d51337..743befa 100644
--- a/src/locale_body.cpp
+++ b/src/locale_body.cpp
@@ -918,7 +918,11 @@
                             (n_locales - inx) * sizeof (*locales));
 
                     delete[] locales;
-                    locales = locale_buf;
+
+                    // point at the statically allocated buffer and reset
+                    // the current capacity to the original capacity
+                    locales        = locale_buf;
+                    locale_bufsize = bufsize;
                 }
                 else {
                     // move facet pointers back
diff --git a/src/locale_body.h b/src/locale_body.h
index 0e7f1e2..094ecc3 100644
--- a/src/locale_body.h
+++ b/src/locale_body.h
@@ -42,11 +42,11 @@
 #include <rw/_defs.h>
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
+_RWSTD_NAMESPACE (std) { 
 
 struct _RWSTD_CLASS_EXPORT locale;
 
-}   // namespace _V3_LOCALE
+}   // namespace std
 
 
 _RWSTD_NAMESPACE (__rw) { 
@@ -93,7 +93,7 @@
 
     __rw_mutex    _C_mutex;
 
-    friend struct _V3_LOCALE::locale;
+    friend struct _STD::locale;
 
 public:
 
diff --git a/src/locale_classic.cpp b/src/locale_classic.cpp
index 4fa2e60..11cfbf6 100644
--- a/src/locale_classic.cpp
+++ b/src/locale_classic.cpp
@@ -22,45 +22,76 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
 #define _RWSTD_LIB_SRC
-
-#include <new>
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
+#include <new>             // for placment new
 
-#include <loc/_locale.h>
-
-#include "locale_body.h"
+#include <loc/_locale.h>   // for locale
+#include "once.h"          // for __rw_once()
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
+_RWSTD_NAMESPACE (__rw) { 
+
+// static buffer for the classic "C" locale object
+static union {
+    void* _C_align;
+    char  _C_buf [sizeof (_STD::locale)];
+} __rw_classic;
 
 
-/* static */ const locale& locale::classic ()
+// init-once flag for the classic "C" locale object
+static __rw_once_t
+__rw_classic_once_init = _RWSTD_ONCE_INIT;
+
+
+extern "C" {
+
+// one-time initializer for the classic "C" locale object
+static void
+__rw_init_classic ()
 {
-    // classic locale will not be destroyed during program runtime
-    static _RW::__rw_locale *pbody = _RW::__rw_locale::_C_manage (0, "C");
+#ifdef _RWSTDDEBUG
 
-    static union {
-        void* _C_align;
-        char  _C_buf [sizeof (locale)];
-    } classic_locale;
+    static int init;
 
-    _RWSTD_ASSERT (0 != pbody);
+    // paranoid check: verify that one-time initialization works
+    _RWSTD_ASSERT (0 == init);
 
-    // multiple initialization by multiple threads is benign
-    static locale *pclassic = new (&classic_locale) locale (*pbody);
+    ++init;
+
+#endif   // _RWSTDDEBUG
+
+    // construct the classic "C" locale in the provided buffer
+    new (&__rw_classic) _STD::locale ("C");
+}
+
+}   // extern "C"
+
+}   // namespace __rw
+
+
+_RWSTD_NAMESPACE (std) {
+
+
+/* static */ const locale& locale::
+classic ()
+{
+    // initialize classic locale in the static buffer exactly once
+    _RW::__rw_once (&_RW::__rw_classic_once_init, _RW::__rw_init_classic);
+
+    // cast the address of the buffer to a locale pointer
+    const locale* const pclassic =
+        _RWSTD_REINTERPRET_CAST (locale*, &_RW::__rw_classic);
+
+    _RWSTD_ASSERT (0 != pclassic->_C_body);
 
     return *pclassic;
 }
 
 
-}   // namespace _V3_LOCALE
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
+}   // namespace std
diff --git a/src/locale_combine.cpp b/src/locale_combine.cpp
index 58e841f..8d81a35 100644
--- a/src/locale_combine.cpp
+++ b/src/locale_combine.cpp
@@ -31,8 +31,6 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <locale.h>
 #include <stdio.h>
 #include <string.h>   // for memxxx() and strxxx() functions
@@ -626,7 +624,7 @@
 }   // namespace __rw
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
 
 
 // outlined to hide implementation details
@@ -724,7 +722,4 @@
 }
 
 
-}   // namespace _V3_LOCALE
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
+}   // namespace std
diff --git a/src/locale_core.cpp b/src/locale_core.cpp
index 50af7e4..f35f621 100644
--- a/src/locale_core.cpp
+++ b/src/locale_core.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -30,8 +30,6 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #ifdef __SUNPRO_CC
    // working around SunPro bug 568
 #  include <time.h>
@@ -47,7 +45,7 @@
 #include <sys/stat.h>   // for stat()
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
+_RWSTD_NAMESPACE (std) { 
 
 
 // outlined to hide implementation details
@@ -140,7 +138,7 @@
     if (next && *next) {
 
         // compute the facet category from the value of its id
-        const int facet_cat = _RW::__rw_get_cat (inx + 1);
+        const int facet_cat = _RW::__rw_get_cat (int (inx + 1));
 
         // determine the locale name of the given category
         size_t i = 0;
@@ -200,7 +198,4 @@
 }
 
 
-}   // namespace _V3_LOCALE
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
+}   // namespace std
diff --git a/src/locale_eq.cpp b/src/locale_eq.cpp
index 7d44417..f8949a0 100644
--- a/src/locale_eq.cpp
+++ b/src/locale_eq.cpp
@@ -30,8 +30,6 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <string.h>
 
 #include <loc/_locale.h>
@@ -39,7 +37,7 @@
 #include "locale_body.h"
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
 
 
 bool locale::operator== (const locale &rhs) const
@@ -63,19 +61,24 @@
     if (!_C_body->_C_n_usr_facets && !rhs._C_body->_C_n_usr_facets) {
 
         // in order to compare equal, both bodies must have the same
-        // sets of facets (some slots may still be uninitialized)
+        // sets of facets (some slots may still be uninitialized) and
+        // not have different names
         const bool eql =
            _C_body->_C_std_facet_bits == rhs._C_body->_C_std_facet_bits
         && _C_body->_C_byname_facet_bits == rhs._C_body->_C_byname_facet_bits
         && !memcmp (_C_body->_C_std_facets, rhs._C_body->_C_std_facets,
-                    _C_body->_C_n_std_facets * sizeof *_C_body->_C_std_facets);
+                    _C_body->_C_n_std_facets * sizeof *_C_body->_C_std_facets)
+        && !strcmp (_C_body->_C_name, rhs._C_body->_C_name);
 
         // at least some standard facets must have been replaced in order
-        // for two locale objects not to share the same body
-        _RWSTD_ASSERT (   _C_body->_C_std_facet_bits        != _C_body->_C_all
+        // for two "equal" locale objects not to share the same body, or
+        // the locales' names must be different
+        _RWSTD_ASSERT (   eql
+                       || _C_body->_C_std_facet_bits        != _C_body->_C_all
                        || rhs._C_body->_C_std_facet_bits    != _C_body->_C_all
                        || _C_body->_C_byname_facet_bits     != _C_body->_C_all
-                       || rhs._C_body->_C_byname_facet_bits != _C_body->_C_all);
+                       || rhs._C_body->_C_byname_facet_bits != _C_body->_C_all
+                       || strcmp (_C_body->_C_name, rhs._C_body->_C_name));
 
         // facet bits of both objects must be the same if the two objects
         // share the exact same facets (otherwise the bits may or may not
@@ -109,16 +112,38 @@
     if (strcmp (_C_body->_C_name, rhs._C_body->_C_name))
         return false;
 
-    _RWSTD_ASSERT (_C_body->_C_n_usr_facets == rhs._C_body->_C_n_usr_facets);
+    // highest valid index
+    const size_t maxinx =
+        rhs._C_body->_C_n_usr_facets + _RW::__rw_locale::_C_n_std_facets;
 
     // locales with the same (non-0) number of user-defined
     // facets compare equal iff all the facets are identical
     for (_RWSTD_SIZE_T i = 0; i != _C_body->_C_n_usr_facets; ++i) {
 
-        _RWSTD_ASSERT (_C_body->_C_usr_facets [i]);
-        _RWSTD_ASSERT (rhs._C_body->_C_usr_facets [i]);
+        const _RW::__rw_facet* const pf = _C_body->_C_usr_facets [i];
 
-        if (_C_body->_C_usr_facets [i] != rhs._C_body->_C_usr_facets [i])
+        _RWSTD_ASSERT (0 != pf);
+        _RWSTD_ASSERT (0 != pf->_C_pid);
+        _RWSTD_ASSERT (0 != *pf->_C_pid);
+
+        // if the facets at the same index aren't the same but their
+        // numeric id's are the locales are not equal; this check short
+        // circuits the linear lookup of the facet in rhs done below
+        if (   pf != rhs._C_body->_C_usr_facets [i]
+            && pf->_C_pid == rhs._C_body->_C_usr_facets [i]->_C_pid)
+            return false;
+
+        // find the index of the facet in rhs if it's installed there
+        size_t inx = rhs._C_body->_C_get_facet_inx (*pf->_C_pid);
+        if (maxinx <= inx || inx < _RW::__rw_locale::_C_n_std_facets)
+            return false;
+
+        // the index starts at _C_n_std_facets
+        inx -= _RW::__rw_locale::_C_n_std_facets;
+
+        // if the two facets aren't the same objects the locales aren't
+        // equal (since they may each behave differently)
+        if (pf != rhs._C_body->_C_usr_facets [inx])
             return false;
     }
 
@@ -126,7 +151,4 @@
 }
 
 
-}   // namespace _V3_LOCALE
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
+}   // namespace std
diff --git a/src/locale_global.cpp b/src/locale_global.cpp
index e2bac05..35c201e 100644
--- a/src/locale_global.cpp
+++ b/src/locale_global.cpp
@@ -30,8 +30,6 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <locale.h>
 #include <string.h>
 
@@ -42,7 +40,7 @@
 
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
+_RWSTD_NAMESPACE (std) { 
 
 /* static */ locale locale::global (const locale &rhs)
 {
@@ -72,7 +70,4 @@
 }
 
 
-}   // namespace _V3_LOCALE
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
+}   // namespace std
diff --git a/src/locale_name.cpp b/src/locale_name.cpp
index dc2ff64..90af867 100644
--- a/src/locale_name.cpp
+++ b/src/locale_name.cpp
@@ -30,8 +30,6 @@
 
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <new>
 #include <string.h>
 
@@ -41,7 +39,7 @@
 #include "locale_body.h"
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) { 
+_RWSTD_NAMESPACE (std) { 
 
 string locale::name () const
 {
@@ -97,8 +95,4 @@
 }
 
 
-}   // namespace _V3_LOCALE
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
-
+}   // namespace std
diff --git a/src/memattr.cpp b/src/memattr.cpp
index f95757b..51adbd2 100644
--- a/src/memattr.cpp
+++ b/src/memattr.cpp
@@ -23,7 +23,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2005-2006 Rogue Wave Software.
+ * Copyright 2005-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -32,6 +32,10 @@
 #include <errno.h>    // for ENOMEM, errno
 #include <string.h>   // for memchr
 
+#ifndef EFAULT
+#  define EFAULT  14   // Linux value
+#endif   // EFAULT
+
 #ifdef __CYGWIN__
    // use the Windows API on Cygwin
 #  define _WIN32
@@ -43,6 +47,12 @@
 #    include <time.h>
 #  endif
 #  include <unistd.h>     // for getpagesize(), sysconf()
+
+#  if defined (_RWSTD_OS_LINUX) && !defined (__USE_BSD)
+     // needed for caddr_t, madvise, and MADV_WILLNEED
+#    define __USE_BSD
+#  endif   // _RWSTD_OS_LINUX && !__USE_BSD
+
 #  include <sys/mman.h>   // for mincore()
 #  include <sys/types.h>
 
diff --git a/src/messages.cpp b/src/messages.cpp
index 2cbe321..9847638 100644
--- a/src/messages.cpp
+++ b/src/messages.cpp
@@ -210,10 +210,9 @@
 
 // Open a message catalog and assign and return a handle for it.
 
-int
-__rw_cat_open (const _STD::string &cat_name, const _STD::locale &loc)
+int __rw_cat_open (const _STD::string &cat_name, const _STD::locale &loc)
 {
-    _RWSTD_MT_STATIC_GUARD (__rw_open_cat_data);
+    _RWSTD_MT_CLASS_GUARD (__rw_open_cat_data);
 
     const nl_catd catd = catopen (cat_name.c_str (), NL_CAT_LOCALE);
     if (_RWSTD_BAD_CATD == catd)
@@ -233,13 +232,12 @@
 
 
 // Get message text from catalog.
-const char*
-__rw_get_message (int cat, int set_num, int msg_num)
+const char* __rw_get_message (int cat, int set_num, int msg_num)
 {
     if (cat < 0)
         return 0;
 
-    _RWSTD_MT_STATIC_GUARD (__rw_open_cat_data);
+    _RWSTD_MT_CLASS_GUARD (__rw_open_cat_data);
 
     __rw_open_cat_data *const pcat_data = __rw_manage_cat_data (cat, 0);
 
@@ -261,10 +259,9 @@
 
 
 // Get locale to be used for character translation for this message catalog.
-const _STD::locale&
-__rw_get_locale (int cat)
+const _STD::locale& __rw_get_locale (int cat)
 {
-    _RWSTD_MT_STATIC_GUARD (__rw_open_cat_data);
+    _RWSTD_MT_CLASS_GUARD (__rw_open_cat_data);
 
     _RWSTD_ASSERT (0 <= cat);
     __rw_open_cat_data* const pcat_data = __rw_manage_cat_data (cat, 0);
@@ -276,10 +273,9 @@
 
 
 // Close a catalog and release its handle.
-void
-__rw_cat_close (int cat)
+void __rw_cat_close (int cat)
 {
-    _RWSTD_MT_STATIC_GUARD (__rw_open_cat_data);
+    _RWSTD_MT_CLASS_GUARD (__rw_open_cat_data);
     
     __rw_open_cat_data* const pcat_data =
         cat < 0 ? 0 : __rw_manage_cat_data (cat, 0);
diff --git a/src/mman.cpp b/src/mman.cpp
new file mode 100644
index 0000000..eb42e37
--- /dev/null
+++ b/src/mman.cpp
@@ -0,0 +1,139 @@
+/***************************************************************************
+ *
+ * mman.cpp
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+#include <rw/_defs.h>
+
+#ifndef _MSC_VER
+   // <unistd.h> is included here because of PR #26255
+#  include <unistd.h>
+#endif  // _MSC_VER
+
+#include <sys/stat.h>
+
+#ifndef _MSC_VER
+#  include <sys/mman.h>
+#else
+#  include <windows.h>
+#  include <io.h>
+#endif   // _MSC_VER
+
+#include <sys/types.h>
+#include <fcntl.h>
+
+
+_RWSTD_NAMESPACE (__rw) {
+
+
+// maps a named file into memory as shared, read-only, returns
+// the beginning address on success and fills `size' with the
+// size of the file; returns 0 on failure
+void* __rw_mmap (const char* fname, _RWSTD_SIZE_T *size)
+{
+    _RWSTD_ASSERT (0 != fname);
+    _RWSTD_ASSERT (0 != size);
+
+#if !defined (_MSC_VER)
+    struct stat sb;
+    if (stat (fname, &sb) == -1)
+#else
+    struct _stat sb;
+    if (_stat (fname, &sb) == -1)
+#endif
+        return 0;
+
+    *size = sb.st_size;
+
+#if !defined(_MSC_VER)
+    const int fd = open (fname, O_RDONLY);
+
+    if (-1 == fd)
+        return 0;
+
+    // On HPUX systems MAP_SHARED will prevent a second mapping of the same
+    // file if the regions are overlapping; one solution is to make the 
+    // mapping private.
+#if defined(__hpux)
+    void *data = mmap (0, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+#else
+    void *data = mmap (0, sb.st_size, PROT_READ, MAP_SHARED, fd, 0);
+#endif // defined(__hpux__)
+
+    close (fd);
+
+#ifndef MAP_FAILED
+#  define MAP_FAILED (void*)-1
+#endif
+
+    if (MAP_FAILED == data)   // failure
+        return 0;
+#else
+    HANDLE mmf = 
+        CreateFile (fname, GENERIC_READ, FILE_SHARE_READ, NULL,
+                    OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+    if (mmf == INVALID_HANDLE_VALUE)
+        return 0;
+                              
+    HANDLE mmfv = 
+        CreateFileMapping (mmf, NULL, PAGE_READONLY, 0, 0, NULL);
+    if (mmfv == INVALID_HANDLE_VALUE) {
+        CloseHandle (mmf);
+        return 0;
+    }
+
+    void * data = 
+        MapViewOfFile (mmfv, FILE_MAP_READ, 0, 0, sb.st_size);
+
+    // The handles can be safely closed
+    CloseHandle (mmf);
+    CloseHandle (mmfv);
+
+#endif  // _MSC_VER
+
+    return data;
+}
+
+
+void __rw_munmap (const void* pcv, _RWSTD_SIZE_T size)
+{
+    _RWSTD_ASSERT (pcv && size);
+
+        // cast first to void*
+    void* pv = _RWSTD_CONST_CAST (void*, pcv);
+
+    // POSIX munmap() takes a void*, but not all platforms conform
+#ifndef _MSC_VER
+    munmap (_RWSTD_STATIC_CAST (_RWSTD_MUNMAP_ARG1_T, pv), size);
+#else
+    UnmapViewOfFile (pv);
+#endif  // _MSC_VER
+}
+
+
+}   // namespace __rw
diff --git a/src/mman.h b/src/mman.h
new file mode 100644
index 0000000..e04328c
--- /dev/null
+++ b/src/mman.h
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *
+ * mman.h
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#ifndef _RWSTD_MMAN_H_INCLUDED
+#define _RWSTD_MMAN_H_INCLUDED
+
+
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (__rw) {
+
+
+// maps a named file into memory as shared, read-only, returns
+// the beginning address on success and fills 'size' with the
+// size of the file; returns 0 on failure
+void* __rw_mmap (const char*, _RWSTD_SIZE_T*);
+
+// unmaps a memory region
+void __rw_munmap (const void*, _RWSTD_SIZE_T);
+
+
+}   // namespace __rw
+
+
+#endif   // _RWSTD_MMAN_H_INCLUDED
diff --git a/src/num_get.cpp b/src/num_get.cpp
index 2e74731..ddd5a11 100644
--- a/src/num_get.cpp
+++ b/src/num_get.cpp
@@ -6,22 +6,23 @@
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -83,13 +84,23 @@
 typedef unsigned char UChar;
 
 
+extern "C" {
+
 extern const float       __rw_flt_infinity;
 extern const double      __rw_dbl_infinity;
+
+#ifndef _RWSTD_NO_LONG_DOUBLE
+
 extern const long double __rw_ldbl_infinity;
 
+#endif   // _RWSTD_NO_LONG_DOUBLE
+
+}   // extern "C"
+
 
 const char*
-__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags, int prec);
+__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags,
+                     _STD::streamsize prec);
 
 
 // verifies that the `grps' array of size `ngrps' representing the
@@ -419,7 +430,7 @@
                     val.ul = _RWSTD_UINT_MAX - val.ul + 1;
             }
 
-            *_RWSTD_STATIC_CAST (unsigned*, pval) = val.ul;
+            *_RWSTD_STATIC_CAST (unsigned*, pval) = unsigned (val.ul);
             break;
 
         case __rw_facet::_C_int:
@@ -448,7 +459,7 @@
 
 #endif   // _RWSTD_UINT_MAX < _RWSTD_ULONG_MAX
 
-            *_RWSTD_STATIC_CAST (int*, pval) = val.l;
+            *_RWSTD_STATIC_CAST (int*, pval) = int (val.l);
             break;
 
         case __rw_facet::_C_ulong:
diff --git a/src/num_put.cpp b/src/num_put.cpp
index bea2418..76bb60e 100644
--- a/src/num_put.cpp
+++ b/src/num_put.cpp
@@ -22,16 +22,13 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2006 Rogue Wave Software.
+ * Copyright 2001-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
 #define _RWSTD_LIB_SRC
-
 #include <rw/_defs.h>
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
 #include <limits>     // for numeric_limits
 
 #include <stdio.h>    // for snprintf()
@@ -75,7 +72,8 @@
 
 
 const char*
-__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags, int prec);
+__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags,
+                     _STD::streamsize prec);
 
 
 #ifdef _RWSTD_LONG_LONG
@@ -417,7 +415,7 @@
         j = 0;
 
     do {
-        const int dig = (i >> (j * bits)) & basemask;
+        const int dig = int ((i >> (j * bits)) & basemask);
 
         _RWSTD_ASSERT (dig >= 0 && dig <= basemask);
 
@@ -621,13 +619,23 @@
 
     typedef unsigned char UChar;
 
-    if (43 /* '+' or '-' */ == __rw_digit_map [UChar (*beg)])
+    // is there a sign?
+    bool sgn = false;
+
+    if (43 /* '+' or '-' */ == __rw_digit_map [UChar (*beg)]) {
+        sgn = true;
         ++beg;
+    }
 
     const char* pstr;
 
     switch (__rw_digit_map [UChar (*beg)]) {
-    case 18 /* 'I' or 'i' */ : pstr = "iInNfF\0\0"; break;
+
+    case 18 /* 'I' or 'i' */ :
+        pstr = "iInNfF\0\0";
+        len  = 3;
+        break;
+
     case 23 /* 'N' or 'n' */ : {
 
         // distinguish between quiet and signaling NaN
@@ -638,12 +646,18 @@
         // AIX, output NaNQ and NaNS, respectively)
 
         const UChar last = __rw_digit_map [UChar (*(end - 1))];
-        if (26 /* 'Q' or 'q' */ == last)
+        if (26 /* 'Q' or 'q' */ == last) {
             pstr = "nNaAnNqQ";
-        else if (28 /* 'S' or 's' */ == last)
+            len  = 4;
+        }
+        else if (28 /* 'S' or 's' */ == last) {
             pstr = "nNaAnNsS";
-        else
+            len  = 4;
+        }
+        else {
             pstr = "nNaAnN\0\0";
+            len  = 3;
+        }
         break;
     }
 
@@ -657,9 +671,12 @@
     beg [1] = pstr [cap + 2];
     beg [2] = pstr [cap + 4];
     beg [3] = pstr [cap + 6];
-    beg [4] = '\0';
 
-    end = beg + 3 + ('0' != beg [3]);
+    end = beg + 3 + ('\0' != beg [3]);
+
+    // increase the length by one for the sign
+    if (sgn)
+        ++len;
 
 #endif   // _WIN{32,64}
 
@@ -900,6 +917,3 @@
 
 
 }   // namespace __rw
-
-
-#endif   // _V3_LOCALE
diff --git a/src/once.cpp b/src/once.cpp
new file mode 100644
index 0000000..9d6ae96
--- /dev/null
+++ b/src/once.cpp
@@ -0,0 +1,190 @@
+/***************************************************************************
+ *
+ * once.cpp - one time initialization
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2007 Rogue Wave Software.
+ * 
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+#include <rw/_defs.h>
+#include <rw/_mutex.h>
+
+#include "once.h"
+
+
+_RWSTD_NAMESPACE (__rw) {
+
+
+extern "C" {
+
+
+#ifdef _RWSTD_THREAD_ONCE
+
+
+// implementation that relies on the system one-time initialization
+// mechanism such as pthread_once()
+_RWSTD_EXPORT int
+__rw_once (__rw_once_t *once, void (*func)())
+{
+    _RWSTD_ASSERT (0 != once && 0 != func);
+
+    return _RWSTD_THREAD_ONCE (once, func);
+}
+
+
+#elif defined (_RWSTD_NO_ATOMIC_OPS) && defined (_RWSTD_POSIX_THREADS)
+
+
+// implementation that uses a mutex instead of pthread_once() or atomic
+// operations
+_RWSTD_EXPORT int
+__rw_once (__rw_once_t *once, void (*func)())
+{
+    _RWSTD_ASSERT (0 != once && 0 != func);
+
+    // _C_init may take on one of two valid values:
+    // -1 for a properly initialized __rw_once_t object whose initializer
+    //    hasn't run yet
+    // +1 for ar __rw_once_t object whose initializer has already been
+    //    executed
+    // Any other value (including 0, for __rw_once_t objects that haven't
+    // been properly initialized) is invalid.
+
+    if (-1 == once->_C_init) {
+
+        const int result = pthread_mutex_lock (&once->_C_mutex);
+        if (result)
+            return result;
+
+        if (-1 == once->_C_init) {
+
+            // entered by the first thread and only the first time around,
+            // unless the initialization function throws
+
+            _TRY {
+                func ();
+            }
+            _CATCH (...) {
+                pthread_mutex_unlock (&once->_C_mutex);
+                _RETHROW;
+            }
+
+            once->_C_init += 2;
+        }
+
+        pthread_mutex_unlock (&once->_C_mutex);
+    }
+
+    // verify that initialization took place exactly once and help detect
+    // uninitialized __rw_once_t objects to help catch problems on platforms
+    // such as HP-UX that require pthread_once_t objects to be explicitly
+    // initialized (i.e., not all bits tobe zeroed out) in order for
+    // pthread_once() to succeed
+    _RWSTD_ASSERT (1 == once->_C_init);
+
+    return 0;
+}
+
+
+#elif defined (_RWSTD_REENTRANT)
+
+
+// implementation that uses atomic operations
+_RWSTD_EXPORT int
+__rw_once (__rw_once_t *once, void (*func)())
+{
+    _RWSTD_ASSERT (0 != once && 0 != func);
+
+    volatile int &init = once->_C_init;
+
+restart:
+
+    if (init == 0 && 1 == _RWSTD_ATOMIC_PREINCREMENT (init, false)) {
+
+        // entered by the first thread and only the first time around,
+        // unless the initialization function throws
+
+        _TRY {
+            func ();
+        }
+        _CATCH (...) {
+            _RWSTD_ATOMIC_PREDECREMENT (init, false);
+            _RETHROW;
+        }
+
+        init = 1000;
+    }
+    else {
+        // entered by the second and subsequent threads or on the second
+        // and subsequent calls by the first thread after (or duing)
+        // a successful initialization 
+
+        for (int loop = 0; init < 1000; ++loop) {
+            if (0 == init) {
+                // first time initialization failed via an exception,
+                // try again
+                goto restart;
+            }
+
+            if (32 < loop) {
+                // avoid wasting too many CPU cycles
+                _RWSTD_THREAD_YIELD ();
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+#else   // if !defined (_RWSTD_THREAD_ONCE)
+
+
+// thread-unsafe implementation
+_RWSTD_EXPORT int
+__rw_once (__rw_once_t *once, void (*func)())
+{
+    _RWSTD_ASSERT (0 != once && 0 != func);
+
+    // detect uninitialized __rw_once_t objects to help reveal problems
+    // in reentrant code on platforms such as HP-UX that require
+    // pthread_once_t objects to be explicitly initialized (i.e., not
+    // all bits tobe zeroed out) in order for pthread_once() to succeed
+    _RWSTD_ASSERT (-1 == once->_C_init || 1 == once->_C_init);
+
+    if (once->_C_init == -1) {
+
+        func ();
+
+        once->_C_init = 1;
+    }
+
+    return 0;
+}
+
+#endif   // _RWSTD_THREAD_ONCE
+
+}   // extern "C"
+
+}   // namespace __rw
diff --git a/src/once.h b/src/once.h
new file mode 100644
index 0000000..e25a376
--- /dev/null
+++ b/src/once.h
@@ -0,0 +1,142 @@
+/***************************************************************************
+ *
+ * once.h - one time initialization helpers
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
+#include <rw/_defs.h>
+
+
+#ifdef _RWSTD_REENTRANT
+#  ifdef _RWSTD_OS_SUNOS
+
+#    include <pthread.h>
+#    include <thread.h>
+
+#    define _RWSTD_THREAD_ONCE(once, func)   pthread_once (once, func)
+#    define _RWSTD_THREAD_YIELD()            thr_yield ()
+#    define _RWSTD_ONCE_INIT                 PTHREAD_ONCE_INIT
+
+typedef pthread_once_t __rw_once_t;
+
+#  elif defined (_RWSTD_POSIX_THREADS)
+
+#    include <pthread.h>
+
+#    ifndef _RWSTD_NO_PTHREAD_ONCE
+
+typedef pthread_once_t __rw_once_t;
+
+#      define _RWSTD_THREAD_ONCE(once, func)   pthread_once (once, func)
+#      define _RWSTD_ONCE_INIT                 PTHREAD_ONCE_INIT
+
+#    else   // if defined (_RWSTD_NO_PTHREAD_ONCE)
+
+_RWSTD_NAMESPACE (__rw) {
+
+struct __rw_once_t {
+    pthread_mutex_t _C_mutex;
+    int             _C_init;
+};
+
+}   // namespace __rw
+
+#      define _RWSTD_ONCE_INIT   { PTHREAD_MUTEX_INITIALIZER, -1 }
+
+#    endif   // _RWSTD_NO_PTHREAD_ONCE
+
+#    ifndef _RWSTD_NO_SCHED_YIELD
+#      define _RWSTD_THREAD_YIELD()   sched_yield ()
+#    endif   // _RWSTD_NO_SCHED_YIELD
+#  elif defined (_RWSTD_DCE_THREADS)
+
+#    if defined (_RWSTD_NO_DCE_PTHREAD_H)
+#      include <pthread.h>
+#    else
+#      include <dce/pthread.h>
+#    endif
+
+_RWSTD_NAMESPACE (__rw) {
+
+typedef pthread_once_t __rw_once_t;
+
+}   // namespace __rw
+
+#    define _RWSTD_THREAD_ONCE(once, func)   pthread_once (once, func)
+#    define _RWSTD_THREAD_YIELD()            pthread_yield ()
+#    define _RWSTD_ONCE_INIT                 PTHREAD_ONCE_INIT
+
+#  elif defined (_WIN32)
+
+#    include <windows.h>
+
+_RWSTD_NAMESPACE (__rw) {
+
+struct __rw_once_t { int _C_init; };
+
+}   // namespace __rw
+
+#    define _RWSTD_THREAD_YIELD()   Sleep (0)
+#    define _RWSTD_ONCE_INIT        { 0 }
+#  else   // !_WIN32
+
+_RWSTD_NAMESPACE (__rw) {
+
+struct __rw_once_t { int _C_init; };
+
+}   // namespace __rw
+
+#    define _RWSTD_ONCE_INIT   { 0 }
+#  endif   // _WIN32
+#else   // if !defined (_RWSTD_REENTRANT)
+
+_RWSTD_NAMESPACE (__rw) {
+
+struct __rw_once_t { int _C_init; };
+
+}   // namespace __rw
+
+   // defined to a non-zero value to help detect uninitialized
+   // __rw_once_t objects
+#  define _RWSTD_ONCE_INIT   { -1 }
+#endif   // _RWSTD_REENTRANT
+
+
+#ifndef _RWSTD_THREAD_YIELD
+#  define _RWSTD_THREAD_YIELD()   (void)0
+#endif   // _RWSTD_THREAD_YIELD
+
+
+_RWSTD_NAMESPACE (__rw) {
+
+extern "C" {
+
+_RWSTD_EXPORT int
+__rw_once (__rw_once_t*, void (*)());
+
+}   // extern "C"
+
+
+}   // namespace __rw
diff --git a/src/out_of_range.cpp b/src/out_of_range.cpp
new file mode 100644
index 0000000..c955d16
--- /dev/null
+++ b/src/out_of_range.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * out_of_range.cpp - definitions of class out_of_range members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ out_of_range::
+~out_of_range () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/overflow_error.cpp b/src/overflow_error.cpp
new file mode 100644
index 0000000..1a7f68e
--- /dev/null
+++ b/src/overflow_error.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * overflow_error.cpp - definitions of class overflow_error members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ overflow_error::
+~overflow_error () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/parisc/atomic-64.s b/src/parisc/atomic-64.s
index b6d3a76..2a9aafd 100644
--- a/src/parisc/atomic-64.s
+++ b/src/parisc/atomic-64.s
@@ -1,27 +1,28 @@
 /***************************************************************************
  *
- * atomic-64.s
+ * parisc/atomic-64.s
  *
  * $Id$
  *
  ***************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
  *
  **************************************************************************/
 
diff --git a/src/parisc/atomic.s b/src/parisc/atomic.s
index 38b0fb4..9ec9b26 100644
--- a/src/parisc/atomic.s
+++ b/src/parisc/atomic.s
@@ -1,26 +1,31 @@
 /*****************************************************************************
  *
+ * parisc/atomic.s
+ *
  * $Id$
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ *****************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
  *
  * Copyright 2002-2006 Rogue Wave Software.
  *
  * 2002 Copyright Hewlett-Packard Company
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
  * Routines for atomic increment and decrement of int32_t values
  *
  * int32_t __rw_atomic_incr32(int32_t *addr);
diff --git a/src/punct.cpp b/src/punct.cpp
index 22c8dc2..8f5bf50 100644
--- a/src/punct.cpp
+++ b/src/punct.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -582,7 +582,8 @@
 
 
 const char*
-__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags, int prec)
+__rw_get_stdio_fmat (char buf [32], int type, unsigned fmtflags,
+                     _STD::streamsize prec)
 {
     char *pbuf = buf;
 
@@ -608,7 +609,7 @@
             // 7.19.6.1, p5 of C99 specifies that, when given using the
             // asterisk, negative precision is treated the same as if
             // it were omitted; treat negative precision the same here
-            pbuf += sprintf (pbuf, ".%d", prec);
+            pbuf += sprintf (pbuf, ".%ld", long (prec));
         }
     }
     else if (fmtflags & _RWSTD_IOS_SHOWBASE)
diff --git a/src/range_error.cpp b/src/range_error.cpp
new file mode 100644
index 0000000..c928138
--- /dev/null
+++ b/src/range_error.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * range_error.cpp - definitions of class range_error members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ range_error::
+~range_error () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/runtime_error.cpp b/src/runtime_error.cpp
new file mode 100644
index 0000000..6105a4e
--- /dev/null
+++ b/src/runtime_error.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * runtime_error.cpp - definitions of class runtime_error members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ runtime_error::
+~runtime_error () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/rwstderr.msg b/src/rwstderr.msg
index 56a5d63..eb90e41 100644
--- a/src/rwstderr.msg
+++ b/src/rwstderr.msg
@@ -1,4 +1,30 @@
-$set 1 Rogue Wave(R) C++ Standard Library Error Messages
+$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+$ 
+$ $Id$
+$ 
+$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+$ 
+$ Licensed to the Apache Software  Foundation (ASF) under one or more
+$ contributor  license agreements.  See  the NOTICE  file distributed
+$ with  this  work  for  additional information  regarding  copyright
+$ ownership.   The ASF  licenses this  file to  you under  the Apache
+$ License, Version  2.0 (the  License); you may  not use  this file
+$ except in  compliance with the License.   You may obtain  a copy of
+$ the License at
+$ 
+$ http://www.apache.org/licenses/LICENSE-2.0
+$ 
+$ Unless required by applicable law or agreed to in writing, software
+$ distributed under the  License is distributed on an  "AS IS" BASIS,
+$ WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+$ implied.   See  the License  for  the  specific language  governing
+$ permissions and limitations under the License.
+$ 
+$ Copyright 1994-2007 Rogue Wave Software, Inc.
+$ 
+$ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
+
+$set 1 Apache C++ Standard Library Error Messages
 1 %s: %s: exception
 2 %s: %s: unexpected exception
 3 %s: %s: out of memory
diff --git a/src/rwstderr.rc b/src/rwstderr.rc
index 4ffc913..82115cd 100644
--- a/src/rwstderr.rc
+++ b/src/rwstderr.rc
@@ -1,3 +1,31 @@
+/***********************************************************************
+ *
+ * rwsterr.rc - Apache C++ Standard Library Error Messages
+ *
+ * $Id$
+ *
+ ***********************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 1994-2007 Rogue Wave Software, Inc.
+ * 
+ ***********************************************************************/
+
 #define _RWSTD_NO_INCLUDES
 #include <rw/_error.h>
 
diff --git a/src/sparc/atomic-64.s b/src/sparc/atomic-64.s
index c30b567..20af30f 100644
--- a/src/sparc/atomic-64.s
+++ b/src/sparc/atomic-64.s
@@ -1,27 +1,28 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! atomic-64.s
+! sparc/atomic-64.s
 !
 ! $Id$
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! Copyright 2005-2006 The Apache Software Foundation or its licensors,
-! as applicable.
+! Licensed to the Apache Software  Foundation (ASF) under one or more
+! contributor  license agreements.  See  the NOTICE  file distributed
+! with  this  work  for  additional information  regarding  copyright
+! ownership.   The ASF  licenses this  file to  you under  the Apache
+! License, Version  2.0 (the  "License"); you may  not use  this file
+! except in  compliance with the License.   You may obtain  a copy of
+! the License at
 !
-! Copyright 2002-2006 Rogue Wave Software.
-!
-! Licensed under the Apache License, Version 2.0 (the "License");
-! you may not use this file except in compliance with the License.
-! You may obtain a copy of the License at
-!
-!     http://www.apache.org/licenses/LICENSE-2.0
+! http://www.apache.org/licenses/LICENSE-2.0
 !
 ! Unless required by applicable law or agreed to in writing, software
-! distributed under the License is distributed on an "AS IS" BASIS,
-! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-! See the License for the specific language governing permissions and
-! limitations under the License.
+! distributed under the  License is distributed on an  "AS IS" BASIS,
+! WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+! implied.   See  the License  for  the  specific language  governing
+! permissions and limitations under the License.
+!
+! Copyright 2002-2006 Rogue Wave Software.
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
diff --git a/src/sparc/atomic.s b/src/sparc/atomic.s
index f53251a..a440a82 100644
--- a/src/sparc/atomic.s
+++ b/src/sparc/atomic.s
@@ -1,27 +1,28 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! atomic-sparc.s
+! sparc/atomic.s
 !
 ! $Id$
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !
-! Copyright 2005-2006 The Apache Software Foundation or its licensors,
-! as applicable.
+! Licensed to the Apache Software  Foundation (ASF) under one or more
+! contributor  license agreements.  See  the NOTICE  file distributed
+! with  this  work  for  additional information  regarding  copyright
+! ownership.   The ASF  licenses this  file to  you under  the Apache
+! License, Version  2.0 (the  "License"); you may  not use  this file
+! except in  compliance with the License.   You may obtain  a copy of
+! the License at
 !
-! Copyright 2002-2006 Rogue Wave Software.
-!
-! Licensed under the Apache License, Version 2.0 (the "License");
-! you may not use this file except in compliance with the License.
-! You may obtain a copy of the License at
-!
-!     http://www.apache.org/licenses/LICENSE-2.0
+! http://www.apache.org/licenses/LICENSE-2.0
 !
 ! Unless required by applicable law or agreed to in writing, software
-! distributed under the License is distributed on an "AS IS" BASIS,
-! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-! See the License for the specific language governing permissions and
-! limitations under the License.
+! distributed under the  License is distributed on an  "AS IS" BASIS,
+! WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+! implied.   See  the License  for  the  specific language  governing
+! permissions and limitations under the License.
+!
+! Copyright 2002-2006 Rogue Wave Software.
 !
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
diff --git a/src/time_get.cpp b/src/time_get.cpp
index e1b5a02..bedfc5f 100644
--- a/src/time_get.cpp
+++ b/src/time_get.cpp
@@ -32,12 +32,6 @@
 
 #include <rw/_defs.h>   
 
-#ifndef _RWSTD_NO_V3_LOCALE
-
-
 _RWSTD_NAMESPACE (__rw) {
 
 }   // namespace __rw
-
-
-#endif   // _RWSTD_NO_V3_LOCALE
diff --git a/src/time_put.cpp b/src/time_put.cpp
index 14ad70f..3427684 100644
--- a/src/time_put.cpp
+++ b/src/time_put.cpp
@@ -92,7 +92,7 @@
 // declare these for Linux glibc and SunOS
 extern int daylight;
 extern long int timezone;
-extern void tzset ();
+extern void tzset () _LIBC_THROWS ();
 
 }   // extern "C"
 
diff --git a/src/underflow_error.cpp b/src/underflow_error.cpp
new file mode 100644
index 0000000..0f5bb26
--- /dev/null
+++ b/src/underflow_error.cpp
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *
+ * underflow_error.cpp - definitions of class underflow_error members
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#define _RWSTD_LIB_SRC
+
+#include <stdexcept>
+#include <rw/_defs.h>
+
+
+_RWSTD_NAMESPACE (std) {
+
+// outlined to avoid generating a vtable in each translation unit
+// that uses the class
+/* virtual */ underflow_error::
+~underflow_error () _THROWS (())
+{
+    // no-op
+}
+
+}   // namespace std
diff --git a/src/use_facet.h b/src/use_facet.h
index 2d70e29..9b5944b 100644
--- a/src/use_facet.h
+++ b/src/use_facet.h
@@ -39,6 +39,13 @@
 #include "access.h"
 
 
+// helper macro _RWSTD_DEFINE_FACET_FACTORY() defines a facet factory
+// function called to construct, on demand, objects of specializations
+// of facet class templates
+// _byname facets are constructed on the heap while ordinary facets
+// are constructed in static memory for efficiency and to avoid leaks,
+// and are not destroyed during program lifetime
+
 #ifndef _RWSTD_NO_BYNAME_FACET
 
      // definition for facets that come in both forms, plain and _byname
@@ -51,9 +58,11 @@
            {                                                               \
                __rw_facet* pfacet;                                         \
                if (name) {                                                 \
+                   /* construct a _byname facet on the heap */             \
                    pfacet = new _STD:: Facet ## _byname TArgs (name, ref); \
                }                                                           \
                else {                                                      \
+                   /* construct an ordinary facet in static memory */      \
                    static union {                                          \
                        void *align_;                                       \
                        char  data_ [sizeof (__rw_ ## fid ## _facet)];      \
@@ -80,11 +89,12 @@
            Linkage __rw_facet*                                             \
            __rw_ct_ ## fid (_RWSTD_SIZE_T ref, const char*)                \
            {                                                               \
+               /* construct an ordinary facet in static memory */          \
                static union {                                              \
                    void *align_;                                           \
                    char  data_ [sizeof (__rw_ ## fid ## _facet)];          \
                } f;                                                        \
-               static __rw_facet *pf =                                     \
+               static __rw_facet* const pf =                               \
                    new (&f) __rw_ ## fid ## _facet (ref);                  \
                /* set the pointer to the facet id */                       \
                __rw_access::_C_get_pid (*pf) =                             \
diff --git a/src/wcodecvt.cpp b/src/wcodecvt.cpp
index 6823eab..c42694f 100644
--- a/src/wcodecvt.cpp
+++ b/src/wcodecvt.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -804,13 +804,13 @@
             // in strict mode check wide character for validity
             // (i.e., diagnose surrogate pairs as illegal)
 
-#  if _RWSTD_WCHAR_T_SIZE == _RWSTD_CHAR_SIZE
+#  if _RWSTD_WCHAR_SIZE == _RWSTD_CHAR_SIZE
             typedef unsigned char WIntT;
-#  elif _RWSTD_WCHAR_T_SIZE == _RWSTD_SHRT_SIZE
+#  elif _RWSTD_WCHAR_SIZE == _RWSTD_SHRT_SIZE
             typedef unsigned short WIntT;
-#  elif _RWSTD_WCHAR_T_SIZE ==_RWSTD_INT_SIZE
+#  elif _RWSTD_WCHAR_SIZE ==_RWSTD_INT_SIZE
             typedef unsigned int WIntT;
-#  elif _RWSTD_WCHAR_T_SIZE ==_RWSTD_LLONG_SIZE
+#  elif _RWSTD_WCHAR_SIZE ==_RWSTD_LLONG_SIZE
             typedef unsigned _RWSTD_LONG_LONG WIntT;
 #  else
             typedef unsigned long WIntT;
@@ -1068,7 +1068,7 @@
 }  //  namespace __rw
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
         
 
 _RW::__rw_facet_id codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::id;
@@ -1082,6 +1082,31 @@
 }
 
 
+/* virtual */ bool
+codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::
+do_always_noconv () const _THROWS (())
+{
+    return false;   // conversion always necessary
+}
+
+
+/* virtual */ int
+codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::
+do_encoding () const _THROWS (())
+{
+    // 22.2.1.5.2 p6    1(ext.) <=> 1(int.)
+    return 1;   
+}
+
+
+/* virtual */ int
+codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::
+do_max_length () const _THROWS (())
+{
+    return 1;
+}
+
+
 /* virtual */ codecvt_base::result
 codecvt<wchar_t, char, _RWSTD_MBSTATE_T>::
 do_out (state_type         &state,
@@ -1760,7 +1785,7 @@
 
 #endif   // _RWSTD_NO_WCHAR_T
 
-}   // namespace _V3_LOCALE
+}   // namespace std
 
 
 #ifndef _RWSTD_NO_WCHAR_T
diff --git a/src/wctype.cpp b/src/wctype.cpp
index aab2f5c..14de4a4 100644
--- a/src/wctype.cpp
+++ b/src/wctype.cpp
@@ -371,7 +371,7 @@
 }   // namespace __rw
 
 
-_RWSTD_NAMESPACE (_V3_LOCALE) {
+_RWSTD_NAMESPACE (std) {
 
 
 _RW::__rw_facet_id ctype<wchar_t>::id;
@@ -856,19 +856,19 @@
 ctype_byname<wchar_t>::
 do_narrow (char_type c, char dfault) const
 {
-#if _RWSTD_WCHAR_T_MIN < 0
+#if _RWSTD_WCHAR_MIN < 0
 
     // wchar_t is a signed type
     if (c > L'\0' && c < SCHAR_MAX)
         return char (c);
 
-#else   // if _RWSTD_WCHAR_T_MIN >= 0
+#else   // if _RWSTD_WCHAR_MIN >= 0
 
     // wchar_t is an unsigned type
     if (c < SCHAR_MAX)
         return char (c);
 
-#endif   // _RWSTD_WCHAR_T_MIN
+#endif   // _RWSTD_WCHAR_MIN
 
     const _RW::__rw_codecvt_t* cvt = 
         _RWSTD_STATIC_CAST(const _RW::__rw_codecvt_t*, _C_cvtimpl);
@@ -898,11 +898,11 @@
     }
     else {
         
-#if _RWSTD_WCHAR_T_MIN < 0
+#if _RWSTD_WCHAR_MIN < 0
         // For a signed wchar_t test if the character has a negative value
         if (c < 0)
             return dfault;
-#endif // _RWSTD_WCHAR_T_MIN < 0
+#endif // _RWSTD_WCHAR_MIN < 0
 
         // Look up narrow character value in database; be aware that there 
         // is no way to know what the internal representation is for this 
@@ -918,12 +918,12 @@
         char* ptmp = tmp;
         _RWSTD_SIZE_T utf8_sz = _RW::__rw_itoutf8 (c, tmp);
 
-#if _RWSTD_WCHAR_T_MIN < 0
+#if _RWSTD_WCHAR_MIN < 0
         // compute the invalid bit mask (the MSB set)
-        const wchar_t imask = wchar_t (~(_RWSTD_WCHAR_T_MAX));
+        const wchar_t imask = wchar_t (~(_RWSTD_WCHAR_MAX));
 #else
-        const wchar_t imask = wchar_t (~(_RWSTD_WCHAR_T_MAX >> 1));
-#endif // _RWSTD_WCHAR_T_MIN < 0
+        const wchar_t imask = wchar_t (~(_RWSTD_WCHAR_MAX >> 1));
+#endif // _RWSTD_WCHAR_MIN < 0
 
         typedef unsigned char UChar;
         
@@ -931,7 +931,7 @@
         wc = ptbl [UChar (*ptmp)];
         while (wc & imask) {
             // check validity of the value
-            if (wc == (imask | _RWSTD_WCHAR_T_MAX)) 
+            if (wc == (imask | _RWSTD_WCHAR_MAX)) 
                 return dfault;
 
             ptbl = tbl + 256 * (wc & (~imask));
@@ -1014,12 +1014,12 @@
     }
     else {
 
-#if _RWSTD_WCHAR_T_MIN < 0
+#if _RWSTD_WCHAR_MIN < 0
         // compute the invalid bit mask (the MSB set)
-        const char_type imask = char_type (~(_RWSTD_WCHAR_T_MAX));
+        const char_type imask = char_type (~(_RWSTD_WCHAR_MAX));
 #else
-        const char_type imask = char_type (~(_RWSTD_WCHAR_T_MAX >> 1));
-#endif   // _RWSTD_WCHAR_T_MIN < 0
+        const char_type imask = char_type (~(_RWSTD_WCHAR_MAX >> 1));
+#endif   // _RWSTD_WCHAR_MIN < 0
 
         // Lookup the narrow character in the table; be aware that 
         // the result of the lookup might be the index for another
@@ -1051,7 +1051,7 @@
 }
 
 
-}   // namespace _V3_LOCALE
+}   // namespace std
 
 
 _RWSTD_DEFINE_FACET_FACTORY (static, ctype, <wchar_t>, wctype);
diff --git a/tests/containers/23.list.assign.cpp b/tests/containers/23.list.assign.cpp
index c08e507..aeb3df1 100644
--- a/tests/containers/23.list.assign.cpp
+++ b/tests/containers/23.list.assign.cpp
@@ -246,9 +246,8 @@
     operator() (List &lst, 
                 const ContainerTestCaseData<ListVal>& tdata) const {
 
-        const ContainerTestCase &tcase = tdata.tcase_;
-
-        bool reverse_iter = ListIds::ReverseIterator == tdata.func_.iter_id_
+        const bool reverse_iter =
+               ListIds::ReverseIterator == tdata.func_.iter_id_
             || ListIds::ConstReverseIterator == tdata.func_.iter_id_;
 
         const std::size_t off = tdata.arglen_ - tdata.off2_ - tdata.ext2_;
@@ -284,8 +283,8 @@
         const ListVal* const beg = tdata.arg_ + tdata.off2_;
         const ListVal* const end = beg + tdata.ext2_;
 
-        const Iterator first = _RWSTD_CONST_CAST (const Iterator, beg);
-        const Iterator last  = _RWSTD_CONST_CAST (const Iterator, end);
+        const Iterator first = _RWSTD_CONST_CAST (Iterator, beg);
+        const Iterator last  = _RWSTD_CONST_CAST (Iterator, end);
 
         lst.assign (first, last);
         return lst;
diff --git a/tests/containers/23.list.insert.cpp b/tests/containers/23.list.insert.cpp
index 4eda48c..ff56061 100644
--- a/tests/containers/23.list.insert.cpp
+++ b/tests/containers/23.list.insert.cpp
@@ -383,8 +383,6 @@
     operator() (List &lst, 
                 const ContainerTestCaseData<ListVal>& tdata) const {
 
-        const ContainerTestCase &tcase = tdata.tcase_;
-
         // create a pair of iterators into the list object being modified
         ListIter first1 (lst.begin ());
         _rw_advance (first1, tdata.off1_);
@@ -415,8 +413,6 @@
     operator() (List &lst, 
                 const ContainerTestCaseData<ListVal>& tdata) const {
 
-        const ContainerTestCase &tcase = tdata.tcase_;
-
         // create a pair of iterators into the list object being modified
         ListIter first1 (lst.begin ());
         _rw_advance (first1, tdata.off1_);
@@ -460,16 +456,14 @@
     operator() (List& lst,
                 const ContainerTestCaseData<ListVal>& tdata) const {
 
-        const ContainerTestCase &tcase = tdata.tcase_;
-
         ListIter first1 (lst.begin ());
         _rw_advance (first1, tdata.off1_);
 
         const ListVal* const beg = tdata.arg_ + tdata.off2_;
         const ListVal* const end = beg + tdata.ext2_;
 
-        const Iterator first2 = _RWSTD_CONST_CAST (const Iterator, beg);
-        const Iterator last2  = _RWSTD_CONST_CAST (const Iterator, end);
+        const Iterator first2 = _RWSTD_CONST_CAST (Iterator, beg);
+        const Iterator last2  = _RWSTD_CONST_CAST (Iterator, end);
 
         lst.insert (first1, first2, last2);
         return lst;
diff --git a/tests/containers/23.vector.allocator.cpp b/tests/containers/23.vector.allocator.cpp
new file mode 100644
index 0000000..a36ff05
--- /dev/null
+++ b/tests/containers/23.vector.allocator.cpp
@@ -0,0 +1,277 @@
+/************************************************************************
+ *
+ * 23.vector.allocator.cpp:
+ *
+ *     Test exercising vector specialized on a user-defined allocator
+ *     with a user-defined pointer type.
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
+// disable debug iterators to prevent compilation errors
+#include <rw/_config.h>
+
+#ifndef _RWSTD_NO_DEBUG_ITER
+#  define _RWSTD_NO_DEBUG_ITER
+#endif    // _RWSTD_NO_DEBUG_ITER
+
+#include <memory>
+#include <vector>
+#include <cstddef>   // for ptrdiff_t, size_t
+
+#include <driver.h>
+
+/**************************************************************************/
+
+// DESCRIPTION:
+//   Test instantiates std::vector on a user-defined type, user-defined
+//   allocator and a user-defined pointer type, making sure that everything
+//   still compiles and runs with expected results
+
+//   Note: 20.1.5, p2, Allocator requirements specifies that the type
+//         std::allocator<T>::pointer be a "pointer to T", which might
+//         make this test case not well-defined; it is expected that
+//         this will be changed in a future revision of the Standard
+
+// user-defined pointer type
+template <class T>
+struct Pointer
+{
+    typedef T                               value_type;
+    typedef std::size_t                     size_type;
+    typedef std::ptrdiff_t                  difference_type;
+    typedef value_type*                     pointer;
+    typedef const value_type*               const_pointer;
+    typedef value_type&                     reference;
+    typedef const value_type&               const_reference;
+    typedef std::random_access_iterator_tag iterator_category;
+
+    Pointer (): offset_ (0) { }
+
+    Pointer (const Pointer &rhs)
+        : offset_ (rhs.offset_) { }
+
+    Pointer (difference_type off, int) : offset_ (off) {}
+
+    reference operator* () const {
+        return *_RWSTD_REINTERPRET_CAST (pointer, offset_);
+    }
+
+    bool operator== (const Pointer &rhs) const {
+        return offset_ == rhs.offset_;
+    }
+
+    bool operator!= (const Pointer &rhs) const {
+        return !operator== (rhs);
+    }
+
+    bool operator< (const Pointer &rhs) const {
+        return offset_ < rhs.offset_;
+    }
+
+    bool operator<= (const Pointer &rhs) const {
+        return !(*this > rhs);
+    }
+
+    bool operator> (const Pointer &rhs) const {
+        return rhs < *this;
+    }
+
+    bool operator>= (const Pointer &rhs) const {
+        return !(*this < rhs);
+    }
+
+    Pointer& operator++ () {
+        pointer ptr = _RWSTD_REINTERPRET_CAST (pointer, offset_);
+        offset_ = _RWSTD_REINTERPRET_CAST (difference_type, ++ptr);
+        return *this;
+    }
+
+    Pointer& operator-- () {
+        pointer ptr = _RWSTD_REINTERPRET_CAST (pointer, offset_);
+        offset_ = _RWSTD_REINTERPRET_CAST (difference_type, --ptr);
+        return *this;
+    }
+
+    Pointer& operator+= (difference_type i) {
+        pointer ptr = _RWSTD_REINTERPRET_CAST (pointer, offset_);
+        offset_ = _RWSTD_REINTERPRET_CAST (difference_type, ptr += i);
+        return *this;
+    }
+
+    Pointer& operator-= (difference_type i) {
+        return *this += -i;
+    }
+
+    Pointer operator+ (difference_type i) const {
+        return Pointer (*this) += i;
+    }
+
+    Pointer operator- (difference_type i) const {
+        return Pointer (*this) -= i;
+    }
+
+    difference_type operator- (const Pointer &rhs) const {
+        pointer p1 = _RWSTD_REINTERPRET_CAST (pointer, offset_);
+        pointer p2 = _RWSTD_REINTERPRET_CAST (pointer, rhs.offset_);
+        return p1 - p2;
+    }
+
+    difference_type offset_;
+
+private:
+
+    // deliberately not defined to detect their use
+    void operator++ (int);
+    void operator-- (int);
+
+};
+
+/**************************************************************************/
+
+// user-defined allocator
+template <class T>
+class Allocator
+{
+public:
+    typedef T                               value_type;
+    typedef std::size_t                     size_type;
+    typedef std::ptrdiff_t                  difference_type;
+    typedef Pointer<T>                      pointer;
+    typedef const Pointer<T>                const_pointer;
+    typedef T&                              reference;
+    typedef const T&                        const_reference;
+    typedef std::random_access_iterator_tag iterator_category;
+
+    pointer address (reference r) const {
+        return pointer (&r);
+    }
+
+    const_pointer address (const_reference r) const {
+        return const_pointer (&r);
+    }
+
+    Allocator () throw () {}
+
+    template <class U>
+    Allocator (const Allocator<U>&) throw () {}
+
+    pointer allocate (size_type n, const void* = 0) {
+        void* const ptr = operator new (n * sizeof (T));
+        return pointer (_RWSTD_REINTERPRET_CAST (difference_type, ptr), 1);
+    }
+
+    void deallocate (pointer ptr, size_type) {
+        operator delete (_RWSTD_REINTERPRET_CAST (void*, ptr.offset_));
+    }
+
+    void construct (pointer ptr, const_reference val) {
+        new (_RWSTD_REINTERPRET_CAST (void*, ptr.offset_)) value_type (val);
+    }
+
+    void destroy (pointer ptr) { 
+        _RWSTD_REINTERPRET_CAST (T*, ptr.offset_)->~value_type ();
+    }
+
+    size_type max_size () const throw () {
+        return size_type (-1) / sizeof (T); 
+    }
+
+    template <class U>
+    struct rebind { typedef Allocator<U> other; };
+
+    bool operator== (const Allocator&) const {
+        return 1;
+    }
+
+    bool operator!= (const Allocator &rhs) const {
+        return !operator== (rhs);
+    }
+};
+
+/**************************************************************************/
+
+// user-defined type
+struct MyClass
+{
+    int i_;
+    int j_;
+};
+
+/**************************************************************************/
+
+#ifndef _RWSTD_NO_EXPLICIT_INSTANTIATION
+
+// explicitly instantiate to better exercise the template
+template class std::vector<MyClass, Allocator<MyClass> >;
+
+#endif   // _RWSTD_NO_EXPLICIT_INSTANTIATION
+
+
+static int
+run_test (int, char**)
+{
+    rw_warn (0, 0, __LINE__, "debugging iterators disabled");
+
+    typedef std::vector<MyClass, Allocator<MyClass> > Vector;
+
+    const Vector::size_type nelems = 256;
+
+    const MyClass value = { 0, 0 };
+
+    Vector v (nelems, value);
+
+    rw_assert (nelems == v.size (), 0, __LINE__,
+               "vector(%zu, value_type).size() == %1$zu, got %zu",
+               nelems, v.size ());
+
+    Vector ().swap (v);
+
+    rw_assert (0 == v.size (), 0, __LINE__,
+               "vector().swap(vector&).size() == 0, got %zu",
+               v.size ());
+
+    Vector::size_type i;
+
+    for (i = 0; i != nelems; ++i)
+        v.push_back (value);
+
+    rw_assert (nelems == v.size (), 0, __LINE__,
+               "vector::size() == %1$zu, got %zu",
+               nelems, v.size ());
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char** argv)
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.vector",
+                    "with a user-defined allocator and pointer types",
+                    run_test,
+                    "",
+                    (void*)0);
+}
diff --git a/tests/include/rw_locale.h b/tests/include/rw_locale.h
index 581c7d4..2a139a9 100644
--- a/tests/include/rw_locale.h
+++ b/tests/include/rw_locale.h
@@ -1,27 +1,28 @@
 /************************************************************************
  *
- * localedef.h - declarations of locale testsuite helpers
+ * rw_locale.h - declarations of locale testsuite helpers
  *
  * $Id$
  *
  ************************************************************************
  *
- * Copyright 2005-2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2001-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2006 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -36,11 +37,14 @@
 
 
 _TEST_EXPORT char*
-rw_locales (int = _UNUSED_CAT, const char* = 0);
+rw_locales (int = _UNUSED_CAT, const char* = 0, bool = true);
 
 
+// invokes the locale utility with the arguments specified by 'arg',
+// redirecting its output to the file named by 'fname' if non-null
+// returns the exit status of the utility
 _TEST_EXPORT int
-rw_locale (const char *args, const char *fname);
+rw_locale (const char* /* args */, const char* /* fname */);
 
 
 // creates a temporary directory and defines the RWSTD_LOCALE_ROOT
@@ -53,6 +57,7 @@
 _TEST_EXPORT const char*
 rw_set_locale_root ();
 
+
 // invokes localedef to create a locale database named by the last argument,
 // if non-0, or in a directory specified by the RWSTD_LOCALE_ROOT environment
 // variable otherwise, if it is defined, otherwise in the current working
@@ -64,6 +69,17 @@
 rw_localedef (const char*, const char*, const char*, const char*);
 
 
+// stores up to 'size' wide characters valid in the current locale
+// in consecutive elements of the 'wbuf' buffer; if 'nbytes' is
+// non-zero only wide characters with multibyte sequences of the
+// specified length will be stored (as determined by mblen())
+// returns the number of elements stored
+_TEST_EXPORT _RWSTD_SIZE_T
+rw_get_wchars (wchar_t*      /* wbuf */,
+               _RWSTD_SIZE_T /* size */,
+               int           /* nbytes */ = 0);
+
+
 // an array of multibyte characters 1 to MB_LEN_MAX bytes in length
 typedef char
 rw_mbchar_array_t [_RWSTD_MB_LEN_MAX][_RWSTD_MB_LEN_MAX];
@@ -89,7 +105,28 @@
 // directory
 // returns the name of the locale
 _TEST_EXPORT const char*
-rw_create_locale (const char *charmap, const char *locale);
+rw_create_locale (const char* /* charmap */, const char* /* locale */);
 
 
+// NUL-separated list of locale names specified by the --locales
+// command line option (set by the rw_opt_setlocales handler)
+_TEST_EXPORT extern const char* const&
+rw_opt_locales;
+
+
+// callback function invoked in response to the --locales=<locale-list>
+// command line option to set the rw_opt_locales global variable to the
+// NUL-separated list of locale names to exercise
+_TEST_EXPORT int
+rw_opt_setlocales (int, char*[]);
+
+
+// creates message file and invokes gencat to create message catalog
+// then removes the message file
+// catalog is a '\0' separated list of strings, each of which representing
+// a single message, and with a blank line separating one set from another
+// returns 0 in success
+_TEST_EXPORT int
+rw_create_catalog (const char * /* catname */, const char * /* catalog */);
+
 #endif   // RW_LOCALE_H_INCLUDED
diff --git a/tests/include/rw_streambuf.h b/tests/include/rw_streambuf.h
index 440a1c4..640e7d5 100644
--- a/tests/include/rw_streambuf.h
+++ b/tests/include/rw_streambuf.h
@@ -53,8 +53,7 @@
     Sync      = 0x0400,
     // bit OR-ed with MemFun bits
     Throw     = 0x1000,
-    Failure   = 0x2000,
-    Unknown   = 0x4000
+    Failure   = 0x2000
 };
 
 static const char* const streambuf_func_names[] = {
@@ -235,6 +234,10 @@
     // set the fail and throw flags
     if (fail_set & Throw) {
         throw_set_ = fail_set & ~Throw;
+
+        for (unsigned i = 0; i < 11; ++i)
+            if (throw_set_ & (1U << i))
+                throw_when_ [i] = when;
     }
     else {
         fail_set_ = fail_set;
@@ -281,6 +284,10 @@
     // set the fail and throw flags
     if (fail_set & Throw) {
         throw_set_ = fail_set & ~Throw;
+
+        for (unsigned i = 0; i < 11; ++i)
+            if (throw_set_ & (1U << i))
+                throw_when_ [i] = when;
     }
     else {
         fail_set_ = fail_set;
diff --git a/tests/include/rw_thread.h b/tests/include/rw_thread.h
index 19599e2..621a7d6 100644
--- a/tests/include/rw_thread.h
+++ b/tests/include/rw_thread.h
@@ -59,9 +59,11 @@
 
 // create a pool of nthreads, passing each a successive element
 // of argarray as argument (if non-null) and filling the tidarray
-// array with their id's; if tidarray is null, waits for all
+// array with their id's; if (tidarray == 0), waits for all
 // threads to join and fills the aragarray with the result
 // returned from each thread
+// if (nthreads == SIZE_MAX), sets nthreads to the positive result
+// of rw_get_processors() plus 1, or to 2 otherwise
 // returns 0 on success, or a non-zero value indicating the thread
 // number that failed to create on error
 _TEST_EXPORT int
@@ -71,6 +73,12 @@
                 void* (*)(void*)  /* thr_proc */,
                 void**            /* argarray */);
 
+// returns the number of logical processors/cores on the system,
+// or -1 on error
+_TEST_EXPORT int
+rw_get_cpus ();
+
+
 }   // extern "C"
 
 #endif   // RW_RWTHREAD_H_INCLUDED
diff --git a/tests/include/testdefs.h b/tests/include/testdefs.h
index 164e566..56c0634 100644
--- a/tests/include/testdefs.h
+++ b/tests/include/testdefs.h
@@ -6,22 +6,25 @@
  *
  ***************************************************************************
  *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
  * Copyright 2005-2006 The Apache Software Foundation or its licensors,
  * as applicable.
  *
- * Copyright 2003-2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2003-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -31,6 +34,14 @@
 
 #include <rw/_defs.h>
 
+#ifdef _RWSTD_TEST_SRC
+   // #undef-ine the Compaq C++ macro #defined in response to
+   // the -std strict_ansi_errors compiler option in order to
+   // allow C++ extensions (such POSIX names) to be declared
+   // by C++ libc headers when building the test driver
+#  undef __PURE_CNAME
+#endif   // _RWSTD_TEST_SRC
+
 
 #if    (defined (_WIN32) || defined (_WIN64)) \
     && (defined (RWDLL) || defined (_RWSHARED))
@@ -153,5 +164,13 @@
    ((expr) ? (void)0 : _RW::__rw_assert_fail (#expr, __FILE__, __LINE__, 0))
 #endif   // _RWSTD_NO_PRETTY_FUNCTION, _RWSTD_NO_FUNC
 
+// convenience macro to get number of elements in a c style array
+#define RW_COUNT_OF(x) (sizeof(x) / sizeof(*x))
+
+#if defined (__INTEL_COMPILER) && __INTEL_COMPILER <= 1000
+   // disable warning #279: controlling expression is constant
+   // issued for the commonly used RW_ASSERT(!"not implemented")
+#  pragma warning (disable: 279)
+#endif   // Intel C++ 10.0 and prior
 
 #endif   // RW_TESTDEFS_H_INCLUDED
diff --git a/tests/iostream/27.istream.manip.cpp b/tests/iostream/27.istream.manip.cpp
index 1121ae0..d105406 100644
--- a/tests/iostream/27.istream.manip.cpp
+++ b/tests/iostream/27.istream.manip.cpp
@@ -301,10 +301,9 @@
                skipws, err_type, err_after);
 
     //////////////////////////////////////////////////////////////////
-    // verify that gcount() correctly reflects the number of whitespace
-    // characters extracted from the stream
+    // verify that gcount() value not affected (27.6.1.4 p1)
 
-    rw_assert (extract == is.gcount (), 0, __LINE__,
+    rw_assert (0 == is.gcount (), 0, __LINE__,
                "%u. std::ws (basic_istream<%s, %s >&)."
                "gcount() == %d, got %d; whitespace is"
                " '%c', input is %{*Ac}, initial rdstate() = %{Is}, "
@@ -321,7 +320,11 @@
     // (i.e., the initial stream state), // except...
     std::ios_base::iostate expect_state = state;
 
-    if (!state && (white == cbuf [0] || !err_after)) {
+    if (state) {
+        // lwg 419
+        expect_state |= std::ios_base::failbit;
+    }
+    else if (white == cbuf [0] || !err_after) {
 
 #ifndef _RWSTD_NO_EXCEPTIONS
 
diff --git a/tests/iostream/27.istream.unformatted.get.cpp b/tests/iostream/27.istream.unformatted.get.cpp
index 03580a2..ad89722 100644
--- a/tests/iostream/27.istream.unformatted.get.cpp
+++ b/tests/iostream/27.istream.unformatted.get.cpp
@@ -54,15 +54,14 @@
                int                                nexpect,
                int                                rdstate,
                int                                exceptions,
-               MemFun                             caught)
+               int                                caught)
 {
     static const char* const exnames[] = {
-        "none", "std::ios_base::failure", "unknown exception"
+        "none", "std::ios_base::failure",
+        "streambuf_exception", "unknown exception"
     };
 
-    const char* const caught_what =
-        caught < int (sizeof exnames / sizeof *exnames) ?
-        exnames [caught] : "streambuf_exception";
+    const char* const caught_what = exnames [caught];
 
     // verify that stream is in the expected state
     rw_assert (strm.rdstate () == rdstate, 0, lineno,
@@ -71,13 +70,13 @@
                __LINE__, cname, fun, rdstate, strm.rdstate ());
 
 
-    if (sb.throw_set_ && sb.ncalls (sb.threw_) == sb.fail_when_ + 1) {
+    if (sb.throw_set_ && sb.ncalls (sb.threw_) == sb.fail_when_) {
 
         // verify that the same exception (and not ios_base::failure)
         // as the one thrown from basic_filebuf has been propagated
         // and caught when badbit is set in exceptions, and that no
         // exception has been thrown if exceptions is clear
-        if (exceptions & Bad && caught != sb.threw_) {
+        if (exceptions & Bad && caught != 2) {
 
             rw_assert (false, 0, lineno,
                        "line %d: basic_istream<%s>::%s failed "
@@ -100,7 +99,7 @@
         // or that it increased exactly `fail_when_'
         const int actual = strm.gcount () - gcount;
 
-        rw_assert (!actual || actual ==  sb.fail_when_, 0, lineno,
+        rw_assert (!actual || actual == sb.fail_when_ - 1, 0, lineno,
                    "line %d: basic_istream<%s>::%s changed "
                    "gcount () from %d to %d after a failure; "
                    "either no change from 0 expected, or "
@@ -112,7 +111,7 @@
 
         // verify that ios_base::failure has been thrown (and caught)
         // if badbit is set in exceptions
-        rw_assert (!(exceptions & strm.rdstate ()) || caught == Failure,
+        rw_assert (!(exceptions & strm.rdstate ()) || caught == 1,
                    0, lineno,
                    "line %d: basic_istream<%s>::%s set %{Is} "
                    "but failed to throw ios_base::failure "
@@ -138,14 +137,14 @@
     try {                                     \
         expr;                                 \
     }                                         \
-    catch (MemFun e) {                        \
-        caught = e;                           \
-    }                                         \
     catch (const std::ios_base::failure&) {   \
-        caught = Failure;                     \
+        caught = 1;                           \
+    }                                         \
+    catch (Exception& e) {                    \
+        caught = ex_stream == e.id_ ? 2 : 3;  \
     }                                         \
     catch (...) {                             \
-        caught = Unknown;                     \
+        caught = 3;                           \
     } (void)0
 
 
@@ -201,7 +200,7 @@
 
     int_type got = Traits::eof ();
 
-    MemFun caught = None;
+    int caught = 0;
 
     TRY_GET (got = strm.get ());
 
@@ -252,21 +251,21 @@
     TEST (T, "\x80",  1, 0x80, Good,       Good, 0, -1);
     TEST (T, "\xff ", 2, 0xff, Good,       Good, 0, -1);
 
-    TEST (T, "c",     1, eof,  Eof | Fail, Good, Underflow, 0);
-    TEST (T, "d",     1, eof,  Bad,        Good, Underflow | Throw, 0);
+    TEST (T, "c",     1, eof,  Eof | Fail, Good, Underflow, 1);
+    TEST (T, "d",     1, eof,  Bad,        Good, Underflow | Throw, 1);
 
     eof = 256;
 
     TEST (T, "",  0, eof, Eof | Fail, Good, 0, 0);
     TEST (T, "f", 1, 'f', Good,       Good, 0, 0);
-    TEST (T, "g", 1, eof, Eof | Fail, Good, Underflow, 0);
-    TEST (T, "h", 1, eof, Bad,        Good, Underflow | Throw, 0);
+    TEST (T, "g", 1, eof, Eof | Fail, Good, Underflow, 1);
+    TEST (T, "h", 1, eof, Bad,        Good, Underflow | Throw, 1);
     
     eof = '\0';
 
     TEST (T, "\0", 1, eof, Eof | Fail, Good, 0, -1);
-    TEST (T, "\1", 1, eof, Eof | Fail, Good, Underflow, 0);
-    TEST (T, "\2", 1, eof, Bad,        Good, Underflow | Throw, 0);
+    TEST (T, "\1", 1, eof, Eof | Fail, Good, Underflow, 1);
+    TEST (T, "\2", 1, eof, Bad,        Good, Underflow | Throw, 1);
 }
 
 /***********************************************************************/
@@ -311,7 +310,7 @@
           charT got = charT (UChar (initval));
     const charT val = charT (UChar (expectval));
 
-    MemFun caught = None;
+    int caught = 0;
 
     TRY_GET (strm.get (got));
 
@@ -368,14 +367,14 @@
     TEST (T, "2 ", 2, '\3', '2',  Good,       Good, 0, -1);
     TEST (T, " 3", 2, '\4', ' ',  Good,       Good, 0, -1);
 
-    TEST (T, "4",  1, '\5', '\5', Eof | Fail, Good, Underflow, 0);
-    TEST (T, "5",  1, '\6', '\6', Bad,        Good, Underflow | Throw, 0);
-    TEST (T, "6",  1, '\7', '\6', Eof | Fail, Eof,  Underflow, 0);
-    TEST (T, "7",  1, 'x',   'x', Eof | Fail, Fail, Underflow, 0);
-    TEST (T, "8",  1, 'y',   'y', Eof | Fail, Eof | Fail, Underflow, 0);
-    TEST (T, "9",  1, 'z',   'z', Eof | Fail, Eof | Fail | Bad, Underflow, 0);
+    TEST (T, "4",  1, '\5', '\5', Eof | Fail, Good, Underflow, 1);
+    TEST (T, "5",  1, '\6', '\6', Bad,        Good, Underflow | Throw, 1);
+    TEST (T, "6",  1, '\7', '\6', Eof | Fail, Eof,  Underflow, 1);
+    TEST (T, "7",  1, 'x',   'x', Eof | Fail, Fail, Underflow, 1);
+    TEST (T, "8",  1, 'y',   'y', Eof | Fail, Eof | Fail, Underflow, 1);
+    TEST (T, "9",  1, 'z',   'z', Eof | Fail, Eof | Fail | Bad, Underflow, 1);
 
-    TEST (T, "A",  1, 'a',   'a', Bad,        Bad, Underflow | Throw, 0);
+    TEST (T, "A",  1, 'a',   'a', Bad,        Bad, Underflow | Throw, 1);
 }
 
 /***********************************************************************/
@@ -440,7 +439,7 @@
 
     typedef unsigned char UChar;
 
-    MemFun caught = None;
+    int caught = 0;
 
     charT got [MAXCHARS + 1];
     Traits::assign (got, sizeof got / sizeof *got, charT ('\xfe'));
@@ -521,23 +520,23 @@
 
     // exercise the behavior on underflow() failure indicated
     // by returning traits_type::eof()
-    TEST (T, "78\n9", 4, 4, eof, 0, Eof | Fail, Good,        Underflow, 0);
-    TEST (T, "78901", 5, 5, eof, 0, Eof | Fail, Eof,         Underflow, 0);
-    TEST (T, "78902", 5, 5, eof, 0, Eof | Fail, Fail,        Underflow, 0);
-    TEST (T, "78803", 5, 5, eof, 0, Eof | Fail, Eof | Fail,  Underflow, 0);
-    TEST (T, "89\na", 4, 4, eof, 1, Eof,        Good,        Underflow, 1);
-    TEST (T, "9a\nb", 4, 4, eof, 2, Eof,        Good,        Underflow, 2);
-    TEST (T, "ab\nc", 4, 4, eof, 2, Good,       Good,        Underflow, 3);
+    TEST (T, "78\n9", 4, 4, eof, 0, Eof | Fail, Good,        Underflow, 1);
+    TEST (T, "78901", 5, 5, eof, 0, Eof | Fail, Eof,         Underflow, 1);
+    TEST (T, "78902", 5, 5, eof, 0, Eof | Fail, Fail,        Underflow, 1);
+    TEST (T, "78803", 5, 5, eof, 0, Eof | Fail, Eof | Fail,  Underflow, 1);
+    TEST (T, "89\na", 4, 4, eof, 1, Eof,        Good,        Underflow, 2);
+    TEST (T, "9a\nb", 4, 4, eof, 2, Eof,        Good,        Underflow, 3);
+    TEST (T, "ab\nc", 4, 4, eof, 2, Good,       Good,        Underflow, 4);
 
     // exercise the behavior on underflow() failure caused
     // by throwing an exception
-    TEST (T, "bc\nd", 4, 4, eof, 0, Bad,        Good, Underflow | Throw, 0);
-    TEST (T, "cd\ne", 4, 4, eof, 1, Bad,        Good, Underflow | Throw, 1);
-    TEST (T, "def\n", 4, 4, eof, 2, Bad,        Good, Underflow | Throw, 2);
-    TEST (T, "efg\n", 4, 4, eof, 2, Bad,        Bad,  Underflow | Throw, 2);
-    TEST (T, "fgh\n", 4, 4, eof, 3, Good,       Bad,  Underflow | Throw, 3);
-    TEST (T, "ghij",  4, 4, eof, 3, Good,       Bad,  Underflow | Throw, 3);
-    TEST (T, "hijk",  4, 5, eof, 3, Bad,        Bad,  Underflow | Throw, 3);
+    TEST (T, "bc\nd", 4, 4, eof, 0, Bad,        Good, Underflow | Throw, 1);
+    TEST (T, "cd\ne", 4, 4, eof, 1, Bad,        Good, Underflow | Throw, 2);
+    TEST (T, "def\n", 4, 4, eof, 2, Bad,        Good, Underflow | Throw, 3);
+    TEST (T, "efg\n", 4, 4, eof, 2, Bad,        Bad,  Underflow | Throw, 3);
+    TEST (T, "fgh\n", 4, 4, eof, 3, Good,       Bad,  Underflow | Throw, 4);
+    TEST (T, "ghij",  4, 4, eof, 3, Good,       Bad,  Underflow | Throw, 4);
+    TEST (T, "hijk",  4, 5, eof, 3, Bad,        Bad,  Underflow | Throw, 4);
 
     const std::streamsize N = std::streamsize (MAXCHARS);
     char *buf = new char [N];
@@ -631,7 +630,7 @@
 
     typedef unsigned char UChar;
 
-    MemFun caught = None;
+    int caught = 0;
 
     Streambuf outbuf (strsize, out_failure, out_fail_when);
 
@@ -714,27 +713,27 @@
     TEST (T, "cd\0e", 4, '\0', 2, Good,       Good, 0, 0);
     TEST (T, "def\0", 4, '\0', 3, Good,       Good, 0, 0);
 
-    TEST (T, "efgh",  4, 'f',  0, Eof | Fail, Good,       Underflow, 0);
-    TEST (T, "fghi",  4, 'g',  0, Eof | Fail, Eof,        Underflow, 0);
-    TEST (T, "ghij",  4, 'h',  0, Eof | Fail, Fail,       Underflow, 0);
-    TEST (T, "hijk",  4, 'i',  0, Eof | Fail, Eof | Fail, Underflow, 0);
+    TEST (T, "efgh",  4, 'f',  0, Eof | Fail, Good,       Underflow, 1);
+    TEST (T, "fghi",  4, 'g',  0, Eof | Fail, Eof,        Underflow, 1);
+    TEST (T, "ghij",  4, 'h',  0, Eof | Fail, Fail,       Underflow, 1);
+    TEST (T, "hijk",  4, 'i',  0, Eof | Fail, Eof | Fail, Underflow, 1);
 
-    TEST (T, "ijkl",  4, 'k',  1, Eof,        Good, Underflow, 1);
-    TEST (T, "jklm",  4, 'm',  2, Eof,        Good, Underflow, 2);
+    TEST (T, "ijkl",  4, 'k',  1, Eof,        Good, Underflow, 2);
+    TEST (T, "jklm",  4, 'm',  2, Eof,        Good, Underflow, 3);
 
-    TEST (T, "klmn",  4, 'n',  2, Bad,        Good, Underflow | Throw, 2);
-    TEST (T, "lmno",  4, 'o',  2, Bad,        Bad,  Underflow | Throw, 2);
+    TEST (T, "klmn",  4, 'n',  2, Bad,        Good, Underflow | Throw, 3);
+    TEST (T, "lmno",  4, 'o',  2, Bad,        Bad,  Underflow | Throw, 3);
 
-    TEST (T, "EFGH",  4, 'F',  0, Fail,       Good,       Overflow, 0);
-    TEST (T, "FGHI",  4, 'G',  0, Fail,       Eof,        Overflow, 0);
-    TEST (T, "GHIJ",  4, 'H',  0, Fail,       Fail,       Overflow, 0);
-    TEST (T, "HIJK",  4, 'I',  0, Fail,       Eof | Fail, Overflow, 0);
+    TEST (T, "EFGH",  4, 'F',  0, Fail,       Good,       Overflow, 1);
+    TEST (T, "FGHI",  4, 'G',  0, Fail,       Eof,        Overflow, 1);
+    TEST (T, "GHIJ",  4, 'H',  0, Fail,       Fail,       Overflow, 1);
+    TEST (T, "HIJK",  4, 'I',  0, Fail,       Eof | Fail, Overflow, 1);
 
-    TEST (T, "IJKL",  4, 'K',  1, Fail,       Good, Overflow, 1);
-    TEST (T, "JKLM",  4, 'M',  2, Fail,       Good, Overflow, 2);
+    TEST (T, "IJKL",  4, 'K',  1, Fail,       Good, Overflow, 2);
+    TEST (T, "JKLM",  4, 'M',  2, Fail,       Good, Overflow, 3);
 
-    TEST (T, "KLMN",  4, 'N',  2, Fail,       Good, Overflow | Throw, 2);
-    TEST (T, "LMNO",  4, 'O',  2, Fail,       Bad,  Overflow | Throw, 2);
+    TEST (T, "KLMN",  4, 'N',  2, Fail,       Good, Overflow | Throw, 3);
+    TEST (T, "LMNO",  4, 'O',  2, Fail,       Bad,  Overflow | Throw, 3);
 
     rw_info (0, 0, 0, "27.6.1.3, p15 - std::basic_istream<%s>"
              "::get (basic_streambuf<char_type, traits_type>&)", cname);
diff --git a/tests/iostream/27.ostream.cpp b/tests/iostream/27.ostream.cpp
index 832033a..1a7492b 100644
--- a/tests/iostream/27.ostream.cpp
+++ b/tests/iostream/27.ostream.cpp
@@ -779,16 +779,19 @@
 
     if (!tsb.throws_ && !tnp.throws_) {
 
+        bool pass;
+
+#ifdef _RWSTD_NO_EXT_KEEP_WIDTH_ON_FAILURE
         // verify that width(0) has been called (unless there are exceptions
         // involved, in which case it's unspecified whether width(0) has or
         // has not been called
-        bool pass =
-            !((!exceptions || !tsb.fails_ && !tnp.fails_) && os.width ());
+        pass = !((!exceptions || !tsb.fails_ && !tnp.fails_) && os.width ());
 
         rw_assert (pass, __FILE__, line1,
                    "%d. std::basic_ostream<%s>::operator<<(%s = %{#lc})"
                    ".width () == 0, got %d",
                    line2, cname, tname, val, os.width  ());
+#endif   // _RWSTD_NO_EXT_KEEP_WIDTH_ON_FAILURE
 
         // verify that ios_base::failure has been thrown (and caught)
         // if badbit is set in exceptions
@@ -1409,6 +1412,8 @@
     }
 
     {
+        // exercise LWG issue 581: flush() not unformatted function
+
         test_streambuf<charT> tsb (0);
         Ostream strm (&tsb);
 
diff --git a/tests/iostream/27.stringbuf.virtuals.cpp b/tests/iostream/27.stringbuf.virtuals.cpp
index 50a0f18..e76679b 100644
--- a/tests/iostream/27.stringbuf.virtuals.cpp
+++ b/tests/iostream/27.stringbuf.virtuals.cpp
@@ -34,7 +34,7 @@
 /**************************************************************************/
 
 #undef EOF
-#define EOF   traits_eof
+#define EOF   (_RWSTD_INT_MIN + 2)
 
 #undef NOT_EOF
 #define NOT_EOF   (_RWSTD_INT_MIN + 1)
@@ -179,6 +179,12 @@
         return;
     }
 
+    if (EOF == arg0)
+        arg0 = Traits::eof ();
+
+    if (EOF == ret_expect)
+        ret_expect = Traits::eof ();
+
     // widen the source sequence into the (possibly wide) character buffer
     static charT wstr [4096];
     static charT warg [4096];
diff --git a/tests/localization/22.locale.codecvt.mt.cpp b/tests/localization/22.locale.codecvt.mt.cpp
new file mode 100644
index 0000000..edb160e
--- /dev/null
+++ b/tests/localization/22.locale.codecvt.mt.cpp
@@ -0,0 +1,564 @@
+/************************************************************************
+ *
+ * 22.locale.codecvt.mt.cpp
+ *
+ * test exercising the thread safety of the codecvt facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <ios>        // for ios
+#include <iterator>   // for ostreambuf_iterator
+#include <locale>     // for locale, codecvt
+
+#include <cstring>    // for strlen()
+#include <cwchar>     // for codecvt
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+#include <valcmp.h>    // for rw_strncmp ()
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int rw_opt_nthreads = 1;
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int rw_opt_nloops = 5000;
+
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+//
+template <class internT> //, class externT = char, class stateT = std::mbstate_t>
+struct MyCodecvtData_T
+{
+    enum { BufferSize = 16 };
+
+    typedef char externT;
+    typedef std::mbstate_t stateT;
+    typedef std::codecvt_base::result resultT;
+    typedef std::size_t sizeT;
+
+    int encoding_;
+    sizeT length_;
+    int max_length_;
+    bool always_noconv_;
+
+    externT out_buffer_ [BufferSize];
+    resultT out_result_;
+    sizeT out_length_;
+    stateT out_state_;
+
+    internT in_buffer_  [BufferSize];
+    resultT in_result_;
+    sizeT in_length_;
+    stateT in_state_;
+};
+
+//
+struct MyCodecvtData
+{
+    // out, unshift, in, encoding, always_noconv, length, max_length
+    enum CvtId {
+        cvt_out,
+        cvt_unshift,
+        cvt_in,
+        cvt_encoding,
+        cvt_length,
+        cvt_max_length,
+        cvt_always_noconv,
+        cvt_max
+    };
+
+    // name of the locale the data corresponds to
+    const char* locale_name_;
+
+    // optionally set to the named locale for threads to share
+    std::locale locale_;
+
+    MyCodecvtData_T<char> char_data_;
+    MyCodecvtData_T<wchar_t> wchar_data_;
+
+} my_codecvt_data [MAX_THREADS];
+
+template <class charT>
+struct MyBuffer {
+    const charT* const str;
+    const int str_len;
+};
+
+const MyBuffer<char> nsrc [] = {
+    { "a\x80",       2 },
+    { "b",           1 },
+    { "c\0c",        3 },
+    { "ddd",         3 },
+    { "e\fce\0",     4 },
+    { "ff\0ffff",    5 },
+    { "gggg\0g",     6 },
+    { "hh\0hhhh",    7 },
+    { "i\ni\tiiii",  8 },
+    { "jjjjjjjjj",   9 },
+    { "kkkkkkkkkk", 10 }
+};
+
+const MyBuffer<wchar_t> wsrc [] = {
+    { L"\x0905\x0916", 2 },
+    { L"bb",           2 },
+    { L"\x106c",       2 },
+    { L"dddd",         4 },
+    { L"\xd800\xd801", 2 },
+    { L"ffffff",       6 },
+    { L"\xdfff\xffff", 2 },
+    { L"hhhhhhhh",     8 },
+    { L"i\0i\1i",      4 },
+    { L"jjjjjjjjjj",  10 },
+    { L"kkkkkkkkkkk", 11 }
+};
+
+/**************************************************************************/
+
+template <typename T>
+struct test_is_char
+{
+    enum { value = 0 };
+};
+
+template <>
+struct test_is_char<char>
+{
+    enum { value = 1 };
+};
+
+/**************************************************************************/
+
+template <class internT>
+void test_codecvt (const std::locale& loc,
+                   const MyBuffer<internT>& in,
+                   const MyBuffer<char>& out,
+                   const MyCodecvtData_T<internT>& data,
+                   const MyCodecvtData::CvtId id)
+{
+
+    typedef char externT;
+    typedef std::mbstate_t stateT;
+    typedef std::size_t sizeT;
+
+    typedef std::codecvt<internT, externT, stateT> code_cvt_type;
+
+    const code_cvt_type& cvt =
+        std::use_facet<code_cvt_type>(loc);
+
+    switch (id) {
+    case MyCodecvtData::cvt_out:
+    {
+        externT out_buffer [MyCodecvtData_T<internT>::BufferSize];
+        out_buffer [0] = externT ();
+
+        const int out_len = RW_COUNT_OF (out_buffer);
+
+        const internT* from      = in.str;
+        const internT* from_end  = in.str + in.str_len;
+        const internT* from_next = 0;
+
+        externT* to       = out_buffer;
+        externT* to_limit = out_buffer + out_len;
+        externT* to_next  = 0;
+
+        std::mbstate_t state = std::mbstate_t ();
+
+        const typename MyCodecvtData_T<internT>::resultT result =
+            cvt.out (state, from, from_end, from_next,
+                     to, to_limit, to_next);
+
+        const sizeT len = to_next - to;
+
+        RW_ASSERT (data.out_result_ == result);
+        RW_ASSERT (len == data.out_length_);
+        RW_ASSERT (!rw_strncmp (out_buffer, data.out_buffer_, len));
+    }
+        break;
+    case MyCodecvtData::cvt_unshift:
+    {
+        externT out_buffer [MyCodecvtData_T<internT>::BufferSize];
+        out_buffer [0] = externT ();
+
+        const int out_len = RW_COUNT_OF (out_buffer);
+
+        externT* to       = out_buffer;
+        externT* to_limit = out_buffer + out_len;
+        externT* to_next  = 0;
+
+        std::mbstate_t state = std::mbstate_t ();
+
+        const typename MyCodecvtData_T<internT>::resultT result =
+            cvt.unshift (state, to, to_limit, to_next);
+
+        // 22.2.1.5.2 p5
+        RW_ASSERT (to == to_next);
+
+        // 22.2.1.5.2 p6 required only for codecvt<char, char, mbstate_t>
+        RW_ASSERT (  !test_is_char<internT>::value
+                   || result == std::codecvt_base::noconv);
+    }
+        break;
+    case MyCodecvtData::cvt_in:
+    {
+        internT in_buffer [MyCodecvtData_T<internT>::BufferSize];
+        in_buffer [0] = internT ();
+
+        const int in_len  = RW_COUNT_OF (in_buffer);
+        const int out_len = RW_COUNT_OF (data.out_buffer_);
+
+        const externT* from      = data.out_buffer_;
+        const externT* from_end  = data.out_buffer_ + out_len;
+        const externT* from_next = 0;
+
+        internT* to       = in_buffer;
+        internT* to_limit = in_buffer + in_len;
+        internT* to_next  = 0;
+
+        std::mbstate_t state = std::mbstate_t ();
+
+        const typename MyCodecvtData_T<internT>::resultT result =
+            cvt.in (state, from, from_end, from_next,
+                    to, to_limit, to_next);
+
+        const sizeT len = to_next - to;
+
+        RW_ASSERT (data.in_result_ == result);
+        RW_ASSERT (len == data.in_length_);
+        RW_ASSERT (!rw_strncmp (in_buffer, data.in_buffer_, len));
+    }
+        break;
+    case MyCodecvtData::cvt_encoding:
+        RW_ASSERT (data.encoding_ == cvt.encoding ());
+        break;
+
+    case MyCodecvtData::cvt_length:
+    {
+        const externT* from = out.str;
+        const externT* from_end  = out.str + out.str_len;
+        const size_t   max  = 32;
+
+        std::mbstate_t state = std::mbstate_t ();
+
+        const sizeT len = cvt.length (state, from, from_end, max);
+
+        RW_ASSERT (data.length_ == len);
+    }
+        break;
+
+    case MyCodecvtData::cvt_max_length:
+        RW_ASSERT (data.max_length_ == cvt.max_length ());
+        break;
+    case MyCodecvtData::cvt_always_noconv:
+        RW_ASSERT (data.always_noconv_ == cvt.always_noconv ());
+        break;
+    case MyCodecvtData::cvt_max:
+        break;
+    }
+}
+
+/**************************************************************************/
+
+extern "C" {
+
+bool test_char;    // exercise codecvt<char,char>
+bool test_wchar;   // exercise codecvt<wchar_t,char>
+
+static void*
+thread_func (void*)
+{
+    const int ni = RW_COUNT_OF (nsrc);
+    const int wi = RW_COUNT_OF (wsrc);
+
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        const int inx = i % nlocales;
+        const MyCodecvtData& data = my_codecvt_data [inx];
+
+        // construct a named locale, get a reference to the codecvt
+        // facet from it and use it to format a random money value
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
+
+        const MyCodecvtData::CvtId op =
+            MyCodecvtData::CvtId (i % MyCodecvtData::cvt_max);
+
+        if (test_char) {
+            test_codecvt<char>(loc, nsrc [inx % ni], nsrc [inx % ni],
+                               data.char_data_, op);
+        }
+
+        if (test_wchar) {
+            test_codecvt<wchar_t>(loc, wsrc [inx % wi], nsrc [inx % ni],
+                                  data.wchar_data_, op);
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+template <class internT>
+void run_test_fill (const std::locale& loc,
+                    const MyBuffer<internT>& in,
+                    const MyBuffer<char>& out,
+                    MyCodecvtData_T<internT>& data)
+{
+
+    typedef char externT;
+    typedef std::mbstate_t stateT;
+
+    typedef std::codecvt<internT, externT, stateT> code_cvt_type;
+
+    const code_cvt_type& cvt =
+        std::use_facet<code_cvt_type>(loc);
+
+    //fill in the appropriate fields of data
+    data.encoding_      = cvt.encoding ();
+    data.max_length_    = cvt.max_length ();
+    data.always_noconv_ = cvt.always_noconv ();
+
+    // length
+    {
+        const externT* from = out.str;
+        const externT* from_end  = out.str + out.str_len;
+        const size_t   max  = 32;
+
+        std::mbstate_t state = std::mbstate_t ();
+
+        data.length_ = cvt.length (state, from, from_end, max);
+    }
+
+    // out
+    {
+        const int out_len = RW_COUNT_OF (data.out_buffer_);
+
+        const internT* from      = in.str;
+        const internT* from_end  = in.str + in.str_len;
+        const internT* from_next = 0;
+
+        externT* to       = data.out_buffer_;
+        externT* to_limit = data.out_buffer_ + out_len;
+        externT* to_next  = 0;
+
+        data.out_result_ = cvt.out (data.out_state_,
+                                    from, from_end, from_next,
+                                    to, to_limit, to_next);
+
+        data.out_length_ = to_next - to;
+    }
+
+    //// unshift
+    //{
+    //    externT* to       = data.out_buffer_;
+    //    externT* to_limit = data.out_buffer_ + RW_COUNT_OF (data.out_buffer_);
+    //    externT* to_next  = 0;
+
+    //    std::mbstate_t state = std::mbstate_t ();
+
+    //    data.shift_result_ = cvt.unshift (state, to, to_limit, to_next);
+    //}
+
+    // in
+    {
+        const int out_len = RW_COUNT_OF (data.out_buffer_);
+        const int in_len  = RW_COUNT_OF (data.in_buffer_);
+
+        const externT* from      = data.out_buffer_;
+        const externT* from_end  = data.out_buffer_ + out_len;
+        const externT* from_next = 0;
+
+        internT* to       = data.in_buffer_;
+        internT* to_limit = data.in_buffer_ + in_len;
+        internT* to_next  = 0;
+
+        data.in_result_ = cvt.in (data.in_state_,
+                                  from, from_end, from_next,
+                                  to, to_limit, to_next);
+
+        data.in_length_ = to_next - to;
+    }
+}
+
+static int
+run_test (int, char**)
+{
+    // find all installed locales for which setlocale (LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    const std::size_t maxinx = RW_COUNT_OF (locales);
+
+    const int ni = RW_COUNT_OF (nsrc);
+    const int wi = RW_COUNT_OF (wsrc);
+
+    for (const char* name = locale_list;
+         *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+        locales [inx] = name;
+
+        // fill in the money and results for this locale
+        MyCodecvtData& data = my_codecvt_data [inx];
+        data.locale_name_ = name;
+
+        try {
+            const std::locale loc (data.locale_name_);
+
+            run_test_fill<char>
+                (loc, nsrc [inx % ni], nsrc [inx % ni], data.char_data_);
+
+            run_test_fill<wchar_t>
+                (loc, wsrc [inx % wi], nsrc [inx % ni], data.wchar_data_);
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
+            break;
+    }
+
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
+    rw_info (0, 0, 0,
+             "testing std::codecvt<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             nlocales, int (nlocales), "%#s", locales);
+
+    ///////////////////////////////////////////////////////////////////////
+
+    rw_info (0, 0, 0, "exercising std::codecvt<char, char>");
+
+    test_char   = true;
+    test_wchar  = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result = 
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    ///////////////////////////////////////////////////////////////////////
+
+    rw_info (0, 0, 0, "exercising std::codecvt<wchar_t, char>");
+
+    test_char   = false;
+    test_wchar  = true;
+
+    result = 
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    ///////////////////////////////////////////////////////////////////////
+
+    rw_info (0, 0, 0, "exercising std::codecvt<char, char> and "
+                      "std::codecvt<wchar_t, char>");
+
+    test_char   = true;
+    test_wchar  = true;
+
+    result = 
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.codecvt",
+                    "thread safety", run_test,
+                    "|-nloops#0 "        // must be non-negative
+                    "|-nthreads#0-* "    // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "      // arg must be non-negative
+                    "|-locales= "        // must be provided
+                    "|-shared-locale# ",
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
+}
diff --git a/tests/localization/22.locale.codecvt.out.cpp b/tests/localization/22.locale.codecvt.out.cpp
index 224f3bb..9b1a4b1 100644
--- a/tests/localization/22.locale.codecvt.out.cpp
+++ b/tests/localization/22.locale.codecvt.out.cpp
@@ -148,7 +148,7 @@
         *mbchar = '\0';
     }
 
-#if 2 < _RWSTD_WCHAR_T_SIZE
+#if 2 < _RWSTD_WCHAR_SIZE
 
     // if a multibyte character of the requested size is not found
     // in the low 64K range, try to find one using a random search
diff --git a/tests/localization/22.locale.cons.mt.cpp b/tests/localization/22.locale.cons.mt.cpp
new file mode 100644
index 0000000..eea0b1f
--- /dev/null
+++ b/tests/localization/22.locale.cons.mt.cpp
@@ -0,0 +1,211 @@
+/************************************************************************
+ *
+ * 22.locale.cons.mt.cpp
+ *
+ * test exercising the thread safety of locale ctors
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <locale>     // for locale
+
+#include <cstring>    // for strlen()
+
+#include <rw_locale.h>
+#include <rw_thread.h>   // for rw_get_processors (), rw_thread_pool()
+#include <driver.h>
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   32
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int opt_nthreads = 1;
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int opt_nloops = 20000;
+
+// tristate flag set in response to the --no-combine/--enable-combine
+// command line option
+int opt_combine;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+extern "C" {
+
+static void*
+test_ctors (void*)
+{
+    static const std::locale::category cats[] = {
+        std::locale::all,
+        std::locale::collate,
+        std::locale::ctype,
+        std::locale::messages,
+        std::locale::monetary,
+        std::locale::numeric,
+        std::locale::time,
+        std::locale::none
+    };
+
+    static const std::size_t ncats = sizeof cats / sizeof *cats;
+
+    // the next locale "advanced" in each iteration of the loop
+    std::locale next (locales [0]);
+
+    for (int i = 0; i != opt_nloops; ++i) {
+
+        // compute an index into the array of locales
+        const std::size_t linx = i % nlocales;
+
+        // create two locale objects from the same name and verify
+        // they are equal
+        const std::locale first (next.name ().c_str ());
+        const std::locale second (next.name ().c_str ());
+
+        RW_ASSERT (first == second);
+
+        // create another locale object as a copy of one of the two
+        // above and verify it's equal to the other
+        const std::locale third (first);
+
+        RW_ASSERT (second == third);
+
+        // compute the next index into the array of locales
+        const std::size_t ninx = (i + 1) % nlocales;
+        const char* const next_name = locales [ninx];
+
+        // create the next locale from a name
+        next = std::locale (next_name);
+
+        if (0 <= opt_combine) {
+            // compute an index into the array of categories
+            const std::size_t cinx = i % ncats;
+            const std::locale::category cat = cats [cinx];
+
+            // create a locale from another object and the name of yet
+            // another locale, combining some (none, one, or all) of their
+            // categories
+            const std::locale combined (first, next_name, cat);
+
+            // verify that the locales were created correctly
+            if (std::locale::none == cat || first == next)
+                RW_ASSERT (combined == first);
+            else if (std::locale::all == cat)
+                RW_ASSERT (combined == next);
+            else
+                RW_ASSERT (combined != first && combined != next);
+
+            // repeat the step above but with a locale object
+            const std::locale combined_2 (first, next, cat);
+
+            if (std::locale::none == cat || first == next)
+                RW_ASSERT (combined_2 == first);
+            else if (std::locale::all == cat)
+                RW_ASSERT (combined_2 == next);
+            else
+                RW_ASSERT (combined_2 != first && combined_2 != next);
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    // find all installed locales for which setlocale(LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    for (const char *name = locale_list; *name; name += std::strlen (name) +1) {
+
+        locales [nlocales++] = name;
+
+        if (nlocales == maxinx)
+            break;
+    }
+
+    int result;
+
+    rw_info (0, 0, 0,
+             "testing std::locale ctors with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
+             opt_nthreads, 1 != opt_nthreads,
+             opt_nloops, 1 != opt_nloops,
+             nlocales, int (nlocales), "%#s", locales);
+
+    // create and start a pool of threads and wait for them to finish
+    result = rw_thread_pool (0, std::size_t (opt_nthreads), 0,
+                                 test_ctors, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              opt_nthreads, test_ctors);
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    opt_nthreads = rw_get_cpus ();
+    if (opt_nthreads < 2)
+        opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.cons",
+                    "thread safety", run_test,
+                    "|-combine~ "
+                    "|-nloops#0 "        // must be non-negative
+                    "|-nthreads#0-* "    // must be in [0, MAX_THREADS]
+                    "|-locales=",        // must be provided
+                    &opt_combine,
+                    &opt_nloops,
+                    int (MAX_THREADS),
+                    &opt_nthreads,
+                    &rw_opt_setlocales);
+}
diff --git a/tests/localization/22.locale.ctype.mt.cpp b/tests/localization/22.locale.ctype.mt.cpp
new file mode 100644
index 0000000..bab4b06
--- /dev/null
+++ b/tests/localization/22.locale.ctype.mt.cpp
@@ -0,0 +1,325 @@
+/************************************************************************
+ *
+ * 22.locale.ctype.mt.cpp
+ *
+ * test exercising the thread safety of the ctype facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <locale>     // for locale, ctype
+
+#include <clocale>    // for lconv, localeconv()
+#include <cstdlib>    // for mbstowcs()
+#include <cstring>    // for size_t, strcpy()
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+#include <valcmp.h>
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   16
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int opt_nthreads = 1;
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int opt_nloops = 200000;
+
+// number of locales to use
+int opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int opt_shared_locale;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+struct CtypeData
+{
+    // the name of the locale the data corresponds to
+    const char *locale_name_;
+
+    // optionally set to the named locale for the threads to share
+    std::locale locale_;
+
+    // results of ctype<charT>::widen(char) for char and wchar_t
+    char    widened_ [256];
+    wchar_t wwidened_ [256];
+
+    // array of wide characters to narrow and the number
+    // of valid elements in the array
+    wchar_t wide_ [1024];
+    std::size_t nwide_;
+
+    // results of ctype<charT>::narrow(charT, char) for char
+    // and wchar_t values of wide_ [i]
+    char narrowed_ [256];
+    char wnarrowed_ [1024];
+
+} ctype_data [MAX_THREADS];
+
+
+extern "C" {
+
+bool test_char;    // exercise num_put<char>
+bool test_wchar;   // exercise num_put<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    // number of narrow characters to test (should be 256)
+    const std::size_t nchars =
+        sizeof ctype_data->widened_ / sizeof *ctype_data->widened_;
+
+    for (int i = 0; i != opt_nloops; ++i) {
+
+        const std::size_t inx = std::size_t (i) % nlocales;
+
+        // save the name of the locale
+        const char* const locale_name = locales [inx];
+
+        const CtypeData* const data = ctype_data + inx;
+
+        // construct a named locale
+        const std::locale loc =
+            opt_shared_locale ? data->locale_ : std::locale (locale_name);
+
+        // "random" index/character value
+        const std::size_t cinx = std::size_t (i) % nchars;
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::ctype<char> &ct =
+                std::use_facet<std::ctype<char> >(loc);
+
+            const char wc = ct.widen (char (cinx));
+
+            RW_ASSERT (wc == data->widened_ [cinx]);
+
+            const char nc = ct.narrow (char (cinx), '\0');
+
+            RW_ASSERT (nc == data->narrowed_ [cinx]);
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::ctype<wchar_t> &wct =
+                std::use_facet<std::ctype<wchar_t> >(loc);
+
+            // "random" index into the wide character array
+            const std::size_t winx =
+                std::size_t (i) % data->nwide_;
+
+            const wchar_t wc = wct.widen (char (cinx));
+
+            RW_ASSERT (wc == data->wwidened_ [cinx]);
+
+            const char nc = wct.narrow (data->wide_ [winx], L'\0');
+
+            RW_ASSERT (nc == data->wnarrowed_ [winx]);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    // find all installed locales for which setlocale(LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    // iterate over locales, initializing a global ctype_data array
+    // with LC_CTYPE data obtained from each locale
+    for (const char *name = locale_list; *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+
+        locales [inx] = name;
+
+        CtypeData* const pdata = ctype_data + nlocales;
+
+        // compute the number of wide characters to populate
+        const std::size_t nwide =
+            sizeof pdata->wide_ / sizeof pdata->wide_ [0];
+
+        try {
+            const std::locale loc (name);
+
+            const std::ctype<char> &ct =
+                std::use_facet<std::ctype<char> >(loc);
+
+            const std::ctype<wchar_t> &wct =
+                std::use_facet<std::ctype<wchar_t> >(loc);
+
+            pdata->locale_name_ = name;
+
+            const std::size_t nchars =
+                sizeof pdata->widened_ / sizeof *pdata->widened_;
+
+            for (std::size_t i = 0; i != nchars; ++i) {
+                pdata->widened_  [i] = ct.widen (char (i));
+                pdata->wwidened_ [i] = wct.widen (char (i));
+                pdata->narrowed_ [i] = ct.narrow (char (i), '\0');
+            }
+
+            pdata->nwide_ = rw_get_wchars (pdata->wide_, nwide);
+            for (std::size_t i = 0; i != pdata->nwide_; ++i)
+                pdata->wnarrowed_ [i] = wct.narrow (pdata->wide_ [i], L'\0');
+
+            if (opt_shared_locale)
+                pdata->locale_ = loc;
+
+            ++nlocales;
+        }
+        catch (...) {
+            // skip over a bad locale
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (opt_nlocales))
+            break;
+    }
+
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
+    rw_info (0, 0, 0,
+             "testing std::ctype<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
+             opt_nthreads, 1 != opt_nthreads,
+             opt_nloops, 1 != opt_nloops,
+             nlocales, int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::ctype<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::ctype<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise the thread safety
+    // of the wchar_t specialization
+    result =
+        rw_thread_pool (0, std::size_t (opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              opt_nthreads, thread_func);
+
+    // exercise both the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::ctype<char> and std::ctype<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    opt_nthreads = rw_get_cpus ();
+    if (opt_nthreads < 2)
+        opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.ctype",
+                    "thread safety", run_test,
+                    "|-nloops#0 "        // arg must be non-negative
+                    "|-nthreads#0-* "    // arg must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "      // arg must be non-negative
+                    "|-locales= "        // arg must be provided
+                    "|-shared-locale# ",
+                    &opt_nloops,
+                    int (MAX_THREADS),
+                    &opt_nthreads,
+                    &opt_nlocales,
+                    &rw_opt_setlocales,
+                    &opt_shared_locale);
+}
diff --git a/tests/localization/22.locale.globals.mt.cpp b/tests/localization/22.locale.globals.mt.cpp
new file mode 100644
index 0000000..3b2c813
--- /dev/null
+++ b/tests/localization/22.locale.globals.mt.cpp
@@ -0,0 +1,616 @@
+/************************************************************************
+ *
+ * 22.locale.globals.mt.cpp
+ *
+ * test exercising the thread safety of [locale.global.templates]
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <locale>     // for locale
+
+#include <cwchar>     // for mbstate_t
+#include <cstring>    // for strlen()
+
+#include <rw_locale.h>   // for rw_locales()
+#include <rw_thread.h>   // for rw_get_processors(), rw_thread_pool()
+#include <driver.h>      // for rw_test()
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   16
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int opt_nthreads = 1;
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int opt_nloops = 20000;
+
+enum {
+    opt_inx_codecvt,
+    opt_inx_collate,
+    opt_inx_ctype,
+    opt_inx_messages,
+    opt_inx_moneypunct,
+    opt_inx_moneypunct_intl,
+    opt_inx_numpunct,
+    opt_inx_money_get,
+    opt_inx_money_put,
+    opt_inx_num_get,
+    opt_inx_num_put,
+    opt_inx_time_get,
+    opt_inx_time_put,
+    opt_nfacets
+};
+
+// tri-state options to enable/disable individual facets
+//   opt_facets [i] <  0: facet is initially explicitly disabled
+//   opt_facets [i] == 0: option not specified on the command line
+//   opt_facets [i] >  0: facet is initially explicitly enabled
+int opt_facets [opt_nfacets];
+
+// disable exceptions?
+int opt_no_exceptions;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+// convenience typedefs for all required specializations of standard facets
+typedef std::codecvt<char, char, std::mbstate_t> Codecvt;
+typedef std::collate<char>                       Collate;
+typedef std::ctype<char>                         Ctype;
+typedef std::messages<char>                      Messages;
+typedef std::moneypunct<char, false>             Moneypunct0;
+typedef std::moneypunct<char, true>              Moneypunct1;
+typedef std::numpunct<char>                      Numpunct;
+typedef std::money_get<char>                     MoneyGet;
+typedef std::money_put<char>                     MoneyPut;
+typedef std::num_get<char>                       NumGet;
+typedef std::num_put<char>                       NumPut;
+typedef std::time_get<char>                      TimeGet;
+typedef std::time_put<char>                      TimePut;
+
+typedef std::collate_byname<char>                       CollateByname;
+typedef std::ctype_byname<char>                         CtypeByname;
+typedef std::codecvt_byname<char, char, std::mbstate_t> CodecvtByname;
+typedef std::messages_byname<char>                      MessagesByname;
+typedef std::moneypunct_byname<char, false>             Moneypunct0Byname;
+typedef std::moneypunct_byname<char, true>              Moneypunct1Byname;
+typedef std::numpunct_byname<char>                      NumpunctByname;
+typedef std::time_get_byname<char>                      TimeGetByname;
+typedef std::time_put_byname<char>                      TimePutByname;
+
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+typedef std::collate<wchar_t>                       WCollate;
+typedef std::ctype<wchar_t>                         WCtype;
+typedef std::codecvt<wchar_t, char, std::mbstate_t> WCodecvt;
+typedef std::messages<wchar_t>                      WMessages;
+typedef std::moneypunct<wchar_t, false>             WMoneypunct0;
+typedef std::moneypunct<wchar_t, true>              WMoneypunct1;
+typedef std::numpunct<wchar_t>                      WNumpunct;
+typedef std::money_get<wchar_t>                     WMoneyGet;
+typedef std::money_put<wchar_t>                     WMoneyPut;
+typedef std::num_get<wchar_t>                       WNumGet;
+typedef std::num_put<wchar_t>                       WNumPut;
+typedef std::time_get<wchar_t>                      WTimeGet;
+typedef std::time_put<wchar_t>                      WTimePut;
+
+typedef std::collate_byname<wchar_t>                       WCollateByname;
+typedef std::ctype_byname<wchar_t>                         WCtypeByname;
+typedef std::codecvt_byname<wchar_t, char, std::mbstate_t> WCodecvtByname;
+typedef std::messages_byname<wchar_t>                      WMessagesByname;
+typedef std::moneypunct_byname<wchar_t, false>             WMoneypunct0Byname;
+typedef std::moneypunct_byname<wchar_t, true>              WMoneypunct1Byname;
+typedef std::numpunct_byname<wchar_t>                      WNumpunctByname;
+typedef std::time_get_byname<wchar_t>                      WTimeGetByname;
+typedef std::time_put_byname<wchar_t>                      WTimePutByname;
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+
+extern "C" {
+
+static void*
+test_has_facet (void*)
+{
+    const std::locale classic (std::locale::classic ());
+
+    for (int i = 0; i != opt_nloops; ++i) {
+
+        // save the name of the locale
+        const char* const locale_name = locales [i % nlocales];
+
+        // construct a named locale and imbue it in the ios object
+        // so that the locale is used not only by the num_put facet
+        // but also by the numpunct facet
+        const std::locale loc (locale_name);
+
+        const bool byname = loc != classic;
+
+// call has_facet for each base facet only of it's enabled
+#define HAS(Facet, opt) \
+    (0 <= opt_facets [opt_inx_ ## opt] ? std::has_facet<Facet>(loc) : true)
+
+        HAS (Codecvt, codecvt);
+        HAS (Collate, collate);
+        HAS (Ctype, ctype);
+        HAS (Messages, messages);
+        HAS (Moneypunct0, moneypunct);
+        HAS (Moneypunct1, moneypunct_intl);
+        HAS (MoneyGet, money_get);
+        HAS (MoneyPut, money_put);
+        HAS (Numpunct, numpunct);
+        HAS (NumGet, num_get); 
+        HAS (NumPut, num_put);
+        HAS (TimeGet, time_get);
+        HAS (TimePut, time_put);
+
+// call has_facet for each _byname facet only of it's enabled
+#define HAS_BYNAME(Facet, opt)           \
+    (0 <= opt_facets [opt_inx_ ## opt] ? \
+         byname == std::has_facet<Facet>(loc) : true)
+
+        HAS_BYNAME (CodecvtByname, codecvt);
+        HAS_BYNAME (CollateByname, collate);
+        HAS_BYNAME (CtypeByname, ctype);
+        HAS_BYNAME (MessagesByname, messages);
+        HAS_BYNAME (Moneypunct0Byname, moneypunct);
+        HAS_BYNAME (Moneypunct1Byname, moneypunct_intl);
+        HAS_BYNAME (TimeGetByname, time_get);
+        HAS_BYNAME (TimePutByname, time_put);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+        HAS (WCodecvt, codecvt);
+        HAS (WCollate, collate);
+        HAS (WCtype, ctype);
+        HAS (WMessages, messages);
+        HAS (WMoneypunct0, moneypunct);
+        HAS (WMoneypunct1, moneypunct_intl);
+        HAS (WMoneyGet, money_get);
+        HAS (WMoneyPut, money_put);
+        HAS (WNumpunct, numpunct);
+        HAS (WNumGet, num_get); 
+        HAS (WNumPut, num_put);
+        HAS (WTimeGet, time_get);
+        HAS (WTimePut, time_put);
+
+        HAS_BYNAME (WCodecvtByname, codecvt);
+        HAS_BYNAME (WCollateByname, collate);
+        HAS_BYNAME (WCtypeByname, ctype);
+        HAS_BYNAME (WMessagesByname, messages);
+        HAS_BYNAME (WMoneypunct0Byname, moneypunct);
+        HAS_BYNAME (WMoneypunct1Byname, moneypunct_intl);
+        HAS_BYNAME (WTimeGetByname, time_get);
+        HAS_BYNAME (WTimePutByname, time_put);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+
+static void
+use_facet_loop (const std::locale &classic, int i)
+{
+    static const std::locale::facet* const dummy =
+        (std::locale::facet*)1;
+
+    // save the name of the locale
+    const char* const locale_name = locales [i % nlocales];
+
+    // construct a named locale and imbue it in the ios object
+    // so that the locale is used not only by the num_put facet
+    // but also by the numpunct facet
+    const std::locale loc (locale_name);
+
+    const bool byname = loc != classic;
+
+    {
+
+#define USE(Facet, opt) \
+    (0 <= opt_facets [opt_inx_ ## opt] ? &std::use_facet<Facet>(loc) : dummy)
+
+        const std::locale::facet* const bases[] = {
+            // get pointers to the char specializations of facets
+            USE (Collate, collate),
+            USE (Ctype, ctype),
+            USE (Codecvt, codecvt),
+            USE (Messages, messages),
+            USE (Moneypunct0, moneypunct),
+            USE (Moneypunct1, moneypunct_intl),
+            USE (MoneyGet, money_get),
+            USE (MoneyPut, money_put),
+            USE (Numpunct, numpunct),
+            USE (NumGet, num_get),
+            USE (NumPut, num_put),
+            USE (TimeGet, time_get),
+            USE (TimePut, time_put)
+        };
+
+        if (byname) {
+
+            // get pointers to the char specializations
+            // of byname facets
+            const std::locale::facet* const derived[] = {
+                USE (CollateByname, collate),
+                USE (CtypeByname, ctype),
+                USE (CodecvtByname, codecvt),
+                USE (MessagesByname, messages),
+                USE (Moneypunct0Byname, moneypunct),
+                USE (Moneypunct1Byname, moneypunct_intl),
+                // no money_get_byname or money_put_byname
+                USE (MoneyGet, money_get),
+                USE (MoneyPut, money_put),
+                USE (NumpunctByname, numpunct),
+                // no num_get_byname or num_put_byname
+                USE (NumGet, num_get),
+                USE (NumPut, num_put),
+                USE (TimeGetByname, time_get),
+                USE (TimePutByname, time_put)
+            };
+
+            const std::size_t nbases = sizeof bases / sizeof *bases;
+
+            for (std::size_t i = 0; i != nbases; ++i) {
+                RW_ASSERT (bases [i] != 0);
+                RW_ASSERT (bases [i] == derived [i]);
+            }
+        }
+        else if (0 == opt_no_exceptions) {
+
+#if 1 // def _RWSTD_NO_THREAD_SAFE_EXCEPTIONS
+
+            bool threw;
+
+#define TEST_USE_FACET(Facet, opt)                              \
+    try {                                                       \
+        threw = false;                                          \
+        if (0 <= opt_facets [opt_inx_ ## opt])                  \
+            std::use_facet<Facet>(loc);                         \
+    }                                                           \
+    catch (...) { threw = true; }                               \
+    RW_ASSERT (threw || opt_facets [opt_inx_ ## opt] < 0)
+
+            TEST_USE_FACET (CollateByname, collate);
+            TEST_USE_FACET (CtypeByname, ctype);
+            TEST_USE_FACET (CodecvtByname, codecvt);
+            TEST_USE_FACET (MessagesByname, messages);
+            TEST_USE_FACET (Moneypunct0Byname, moneypunct);
+            TEST_USE_FACET (Moneypunct1Byname, moneypunct_intl);
+            TEST_USE_FACET (NumpunctByname, numpunct);
+            TEST_USE_FACET (TimeGetByname, time_get);
+            TEST_USE_FACET (TimePutByname, time_put);
+
+#endif   // _RWSTD_NO_THREAD_SAFE_EXCEPTIONS
+
+        }
+    }
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    {
+        const std::locale::facet* const bases[] = {
+            // get pointers to the char specializations of facets
+            USE (WCollate, collate),
+            USE (WCtype, ctype),
+            USE (WCodecvt, codecvt),
+            USE (WMessages, messages),
+            USE (WMoneypunct0, moneypunct),
+            USE (WMoneypunct1, moneypunct_intl),
+            USE (WMoneyGet, money_get),
+            USE (WMoneyPut, money_put),
+            USE (WNumpunct, numpunct),
+            USE (WNumGet, num_get),
+            USE (WNumPut, num_put),
+            USE (WTimeGet, time_get),
+            USE (WTimePut, time_put)
+        };
+
+        if (byname) {
+            // get pointers to the char specializations
+            // of byname facets
+            const std::locale::facet* const derived[] = {
+                USE (WCollateByname, collate),
+                USE (WCtypeByname, ctype),
+                USE (WCodecvtByname, codecvt),
+                USE (WMessagesByname, messages),
+                USE (WMoneypunct0Byname, moneypunct),
+                USE (WMoneypunct1Byname, moneypunct_intl),
+                // no money_get_byname or money_put_byname
+                USE (WMoneyGet, money_get),
+                USE (WMoneyPut, money_put),
+                USE (WNumpunctByname, numpunct),
+                // no num_get_byname or num_put_byname
+                USE (WNumGet, num_get),
+                USE (WNumPut, num_put),
+                USE (WTimeGetByname, time_get),
+                USE (WTimePutByname, time_put)
+            };
+
+            const std::size_t nbases = sizeof bases / sizeof *bases;
+
+            for (std::size_t i = 0; i != nbases; ++i) {
+                RW_ASSERT (bases [i] != 0);
+                RW_ASSERT (bases [i] == derived [i]);
+            }
+        }
+        else if (0 == opt_no_exceptions) {
+
+#ifndef _RWSTD_NO_THREAD_SAFE_EXCEPTIONS
+
+            bool threw;
+
+            TEST_USE_FACET (WCollateByname, collate);
+            TEST_USE_FACET (WCtypeByname, ctype);
+            TEST_USE_FACET (WCodecvtByname, codecvt);
+            TEST_USE_FACET (WMessagesByname, messages);
+            TEST_USE_FACET (WMoneypunct0Byname, moneypunct);
+            TEST_USE_FACET (WMoneypunct1Byname, moneypunct_intl);
+            TEST_USE_FACET (WNumpunctByname, numpunct);
+            TEST_USE_FACET (WTimeGetByname, time_get);
+            TEST_USE_FACET (WTimePutByname, time_put);
+
+#endif   // _RWSTD_NO_THREAD_SAFE_EXCEPTIONS
+
+        }
+    }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+}
+
+
+extern "C" {
+
+static void*
+test_use_facet (void*)
+{
+    const std::locale classic (std::locale::classic ());
+
+    for (int i = 0; i != opt_nloops; ++i) {
+        try {
+            use_facet_loop (classic, i);
+        }
+        catch (...) {
+            // what to do here?
+        }
+    }
+
+    return 0;
+}
+
+
+}   // extern "C"
+
+/**************************************************************************/
+
+int opt_has_facet;   // exercise std::has_facet?
+int opt_use_facet;   // exercise std::use_facet?
+
+
+static int
+run_test (int, char**)
+{
+    for (std::size_t i = 0; i != opt_nfacets; ++i) {
+        if (0 < opt_facets [i]) {
+            for (std::size_t j = 0; j != opt_nfacets; ++j) {
+                if (opt_facets [j] == 0)
+                    opt_facets [j] = -1;
+            }
+            break;
+        }
+    }
+
+    rw_note (0 <= opt_facets [opt_inx_codecvt], 0, __LINE__,
+             "std::codecvt tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_collate], 0, __LINE__,
+             "std::collate tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_ctype], 0, __LINE__,
+             "std::ctype tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_messages], 0, __LINE__,
+             "std::messages tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_moneypunct], 0, __LINE__,
+             "std::moneypunct<charT, false> tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_moneypunct_intl], 0, __LINE__,
+             "std::moneypunct<charT, true> tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_money_get], 0, __LINE__,
+             "std::money_get tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_money_put], 0, __LINE__,
+             "std::money_put tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_numpunct], 0, __LINE__,
+             "std::numpunct tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_num_get], 0, __LINE__,
+             "std::num_get tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_num_put], 0, __LINE__,
+             "std::num_put tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_time_get], 0, __LINE__,
+             "std::time_get tests disabled");
+
+    rw_note (0 <= opt_facets [opt_inx_time_put], 0, __LINE__,
+             "std::time_put tests disabled");
+
+    rw_note (0 == opt_no_exceptions, 0, __LINE__,
+             "tests involving exceptions disabled");
+
+    // find all installed locales for which setlocale(LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    // set to true if the classic "C" locale is on the lost
+    bool has_classic = false;
+
+    for (const char *name = locale_list; *name; name += std::strlen (name) +1) {
+
+        locales [nlocales++] = name;
+
+        if (!has_classic && 0 == std::strcmp ("C", name))
+            has_classic = true;
+
+        if (nlocales == maxinx)
+            break;
+    }
+
+    // when the classic "C" locale isn't on the list put it there
+    // unless the list was explicitly specified on the command line
+    if (1 < nlocales && !has_classic && 0 == rw_opt_locales)
+        locales [0] = "C";
+
+    int result;
+
+    rw_info (0, 0, 0,
+             "testing std::locale globals with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
+             opt_nthreads, 1 != opt_nthreads,
+             opt_nloops, 1 != opt_nloops,
+             nlocales, int (nlocales), "%#s", locales);
+
+    if (opt_has_facet >= 0) {
+        rw_info (0, 0, 0,
+                 "template <class T> bool std::has_facet (const locale&)");
+
+        // create and start a pool of threads and wait for them to finish
+        result = rw_thread_pool (0, std::size_t (opt_nthreads), 0,
+                                 test_has_facet, 0);
+
+        rw_error (result == 0, 0, __LINE__,
+                  "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+                  opt_nthreads, test_has_facet);
+    }
+    else {
+        rw_note (0, 0, 0, "std::has_facet test disabled");
+    }
+
+    if (opt_use_facet >= 0) {
+        rw_info (0, 0, 0,
+                 "template <class T> const T& std::use_facet (const locale&)");
+
+#ifdef _RWSTD_NO_THREAD_SAFE_EXCEPTIONS
+
+        rw_warn (0, 0, 0,
+                 "exceptions not thread safe, skipping that part of test");
+
+#endif   // _RWSTD_NO_THREAD_SAFE_EXCEPTIONS
+
+
+        // create and start a pool of threads and wait for them to finish
+        result = rw_thread_pool (0, std::size_t (opt_nthreads), 0,
+                                 test_use_facet, 0);
+
+        rw_error (result == 0, 0, __LINE__,
+                  "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+                  opt_nthreads, test_use_facet);
+    }
+    else {
+        rw_note (0, 0, 0, "std::use_facet test disabled");
+    }
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    opt_nthreads = rw_get_cpus ();
+    if (opt_nthreads < 2)
+        opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.global.templates",
+                    "thread safety", run_test,
+                    "|-has_facet~ "
+                    "|-use_facet~ "
+                    "|-nloops#0 "        // arg must be non-negative
+                    "|-nthreads#0-* "    // arg must be in [0, MAX_THREADS]
+                    "|-locales= "        // argument must be provided
+                    "|-no-exceptions# "  // disable exceptions
+                    "|-codecvt~ "        // enable/disable individual facets
+                    "|-collate~ "
+                    "|-ctype~ "
+                    "|-messages~ "
+                    "|-moneypunct~ "
+                    "|-moneypunct_intl~ "
+                    "|-money_get~ "
+                    "|-money_put~ "
+                    "|-numpunct~ "
+                    "|-num_get~ "
+                    "|-num_put~ "
+                    "|-time_get~ "
+                    "|-time_put~ ",
+                    &opt_has_facet,
+                    &opt_use_facet,
+                    &opt_nloops,
+                    int (MAX_THREADS),
+                    &opt_nthreads,
+                    &rw_opt_setlocales,
+                    &opt_no_exceptions,
+                    opt_facets + opt_inx_codecvt,
+                    opt_facets + opt_inx_collate,
+                    opt_facets + opt_inx_ctype,
+                    opt_facets + opt_inx_messages,
+                    opt_facets + opt_inx_moneypunct,
+                    opt_facets + opt_inx_moneypunct_intl,
+                    opt_facets + opt_inx_money_get,
+                    opt_facets + opt_inx_money_put,
+                    opt_facets + opt_inx_numpunct,
+                    opt_facets + opt_inx_num_get,
+                    opt_facets + opt_inx_num_put,
+                    opt_facets + opt_inx_time_get,
+                    opt_facets + opt_inx_time_put);
+}
diff --git a/tests/localization/22.locale.messages.cpp b/tests/localization/22.locale.messages.cpp
index d4dafff..ec0bee0 100644
--- a/tests/localization/22.locale.messages.cpp
+++ b/tests/localization/22.locale.messages.cpp
@@ -31,26 +31,20 @@
 #include <driver.h>      // for rw_test()
 #include <environ.h>     // for rw_putenv()
 #include <file.h>        // for rw_nextfd()
-#include <rw_locale.h>   // for rw_locales()
+#include <rw_locale.h>   // for rw_locales(), rw_create_catalog()
 #include <rw_process.h>  // for rw_system()
 
-#ifndef _MSC_VER
-#  include <nl_types.h>  // for cat operations
-#endif
-
 #include <cstring>   // for strlen()
-#include <cstdlib>   // for getcwd(), getenv()
-#include <cstdio>    // for FILE, fopen(), fprintf()
+#include <cstdlib>   // for getenv()
+#include <cstdio>    // for remove()
 #include <clocale>   // for LC_ALL
 
 #include <cwchar>    // for mbsinit()
 
-
 #ifndef _RWSTD_NO_NEW_HEADER
-#  include <stdio.h>         // for fileno()
 #  if defined (_MSC_VER)
 #    include <io.h>          // for _open()
-#    include <direct.h>
+#    include <direct.h>      // for getcwd()
 #  else
 #    include <sys/types.h>
 #    include <sys/stat.h>
@@ -260,75 +254,7 @@
     }
 };
 
-
-void generate_catalog (const char *msg_name,
-                       const char* const text [MAX_SETS][MAX_MESSAGES])
-{
-    std::FILE* const f = std::fopen (msg_name, "w");
-
-    if (!f)
-        return;
-
-#ifndef _WIN32
-
-    for (int i = 0; i < MAX_SETS; ++i) {
-        std::fprintf (f, "$set %d This is Set %d\n", i+1, i+1);
-        for (int j = 0; j < MAX_MESSAGES; ++j) {
-            std::fprintf (f, "%d %s\n", j + 1, text [i][j]);
-        }
-    }
-
-#else   // if defined (_WIN32)
-
-    std::fprintf (f, "STRINGTABLE\nBEGIN\n");
-    for (int i = 0; i < MAX_SETS; ++i) {
-        for (int j = 0; j < MAX_MESSAGES; ++j) {
-            const int msgid = msg_id (i + 1, j + 1);
-            std::fprintf (f, "%d \"%s\"\n", msgid, text[i][j]);
-        }
-    }
-
-    std::fprintf (f, "END\n");
-
-#endif   // _WIN32
-
-    std::fclose (f);
-
-    char *cat_name = new char [std::strlen (msg_name) + 1];
-    const char *dot = std::strrchr (msg_name, '.');
-    std::strncpy (cat_name, msg_name, dot - msg_name);
-    *(cat_name + (dot - msg_name)) = '\0';
-
-#ifndef _WIN32
-
-    rw_system ("gencat %s.cat %s", cat_name, msg_name);
-
-#else   // if defined (_WIN32)
-
-    char cpp_name [128];
-
-    std::sprintf (cpp_name, "%s.cpp", cat_name);
-
-    std::FILE* const cpp_file = std::fopen (cpp_name, "w");
-    std::fprintf (cpp_file, "void foo () { }");
-    std::fclose (cpp_file);
-
-    rw_system (   "rc -r %s.rc "
-               "&& cl -nologo -c %s"
-               "&& link -nologo /DLL /OUT:%s.dll %s.obj %s.res",
-               cat_name,
-               cpp_name,
-               cat_name, cat_name, cat_name);
-
-    rw_system (SHELL_RM_F "%s %s.rc %s.res %s.obj",
-               cpp_name, cat_name, cat_name, cat_name);
-
-#endif   // _WIN32
-
-    delete[] cat_name;
-
-    std::remove (msg_name);
-}
+static std::string catalog;
 
 /***************************************************************************/
 
@@ -527,13 +453,23 @@
     int fdcount [2];
     int next_fd [2];
 
+#ifndef _WIN32
     next_fd [0] = rw_nextfd (fdcount + 0);
+#else
+    // don't test file descriptor leaking on Win32 to avoid
+    // invalid parameter error
+    // catalog functions not uses file descriptors
+    next_fd [0] = fdcount [0] = 0;
+#endif
 
     rw_info (0, 0, __LINE__,
              "std::messages<%s>::open() and close() in locale(#%s)",
              cname, loc_name);
 
-    const std::locale loc (loc_name);
+    // construct a copy of the named locale or default
+    // when no name is specified
+    const std::locale loc =
+        loc_name ? std::locale (loc_name) : std::locale ();
 
     const std::messages<charT>& msgs =
         std::use_facet<std::messages<charT> >(loc);
@@ -548,7 +484,11 @@
     close_catalog (msgs, cat, true, cname, __LINE__);
 
     // verify that no file descriptor has leaked
+#ifndef _WIN32
     next_fd [1] = rw_nextfd (fdcount + 1);
+#else
+    next_fd [1] = fdcount [1] = 0;
+#endif
 
     rw_assert (next_fd [1] == next_fd [0] && fdcount [0] == fdcount [1],
                0, __LINE__,
@@ -564,7 +504,10 @@
                const char* const text[5][5],
                const char *cname)
 {
-    const std::locale loc (loc_name);
+    // construct a copy of the named locale or default
+    // when no name is specified
+    const std::locale loc =
+        loc_name ? std::locale (loc_name) : std::locale ();
 
     const std::messages<charT>& msgs =
         std::use_facet<std::messages<charT> > (loc);
@@ -584,9 +527,9 @@
     typedef std::allocator<charT>                       Allocator;
     typedef std::basic_string<charT, Traits, Allocator> String;
 
-    for (int setId = 1; setId < MAX_SETS; ++setId) {
+    for (int setId = 1; setId <= MAX_SETS; ++setId) {
 
-        for (int msgId = 1; msgId < MAX_MESSAGES; ++msgId) {
+        for (int msgId = 1; msgId <= MAX_MESSAGES; ++msgId) {
 
             const int id = msg_id (setId, msgId);
             const String got = msgs.get (cat, setId, id, def);
@@ -771,16 +714,12 @@
         std::sprintf (msg_name, "rwstdmessages_%d.rc", int (i));
 #endif
 
-        generate_catalog (msg_name, messages);
+        rw_create_catalog (msg_name, catalog.c_str ());
 
         const char* const dot = std::strrchr (msg_name, '.');
         std::strncpy (catalog_names[i], msg_name, dot - msg_name);
         *(catalog_names[i] + (dot - msg_name)) = '\0';
 
-#ifdef _WIN32
-        std::strcat (catalog_names[i], ".dll");
-#endif   // _WIN32
-
         // open each catalog (expect success)
         cats [i] = open_catalog (msgs, catalog_names [i],
                                  loc, 0, cname, __LINE__);
@@ -878,9 +817,16 @@
 static int
 run_test (int, char*[])
 {
+    for (int i = 0; i < MAX_SETS; ++i) {
+        for (int j = 0; j < MAX_MESSAGES; ++j)
+            catalog.append (messages [i][j], std::strlen (messages [i][j]) + 1);
+
+        catalog.append (1, '\0');
+    }
+
     const char* const locname = find_named_locale ();
 
-    generate_catalog (MSG_NAME, messages);
+    rw_create_catalog (MSG_NAME, catalog.c_str ());
 
     test_messages (char (), "char", locname);
 
diff --git a/tests/localization/22.locale.messages.mt.cpp b/tests/localization/22.locale.messages.mt.cpp
new file mode 100644
index 0000000..496ecbb
--- /dev/null
+++ b/tests/localization/22.locale.messages.mt.cpp
@@ -0,0 +1,340 @@
+/************************************************************************
+ *
+ * 22.locale.messages.mt.cpp
+ *
+ * test exercising the thread safety of the messages facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <locale>
+
+#include <driver.h>      // for rw_test()
+#include <rw_locale.h>   // for rw_create_catalog()
+#include <rw_thread.h>
+#include <valcmp.h>      // for rw_strncmp ()
+
+#include <cstring>   // for strlen()
+#include <cstdio>    // for remove()
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int rw_opt_nthreads = 1;
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int rw_opt_nloops = 100000;
+
+// locale for threads to share
+static const
+std::locale locale;
+
+// message catalog for threads to share
+static
+std::messages_base::catalog catalog;
+
+static
+std::messages_base::catalog wcatalog;
+
+/**************************************************************************/
+
+#ifndef _WIN32
+#  define CAT_NAME "./rwstdmessages.cat"
+#  define MSG_NAME "rwstdmessages.msg"
+#else
+#  define CAT_NAME "rwstdmessages.dll"
+#  define MSG_NAME "rwstdmessages.rc"
+#endif
+
+#define MAX_SETS 5
+#define MAX_MESSAGES  5
+
+
+int msg_id (int set, int id)
+{
+#ifdef _WIN32
+
+    return (set - 1) * 5 + id;
+
+#else
+
+    _RWSTD_UNUSED (set);
+    return id;
+
+#endif
+}
+
+/**************************************************************************/
+
+static const char* const
+messages [MAX_SETS][MAX_MESSAGES] = {
+    { "First set, first message",
+      "First set, second message",
+      "First set, third message",
+      "First set, fourth message",
+      "First set, fifth message"
+    },
+    { "Second set, first message",
+      "Second set, second message",
+      "Second set, third message",
+      "Second set, fourth message",
+      "Second set, fifth message"
+    },
+    { "Third set, first message",
+      "Third set, second message",
+      "Third set, third message",
+      "Third set, fourth message",
+      "Third set, fifth message"
+    },
+    { "Fourth set, first message",
+      "Fourth set, second message",
+      "Fourth set, third message",
+      "Fourth set, fourth message",
+      "Fourth set, fifth message"
+    },
+    { "Fifth set, first message",
+      "Fifth set, second message",
+      "Fifth set, third message",
+      "Fifth set, fourth message",
+      "Fifth set, fifth message"
+    }
+};
+
+static std::string str_messages;
+
+/**************************************************************************/
+
+template <class T>
+void test_open_close (const std::locale& loc,
+                      const std::messages<T>& msgs,
+                      const std::string& name)
+{
+    std::messages_base::catalog cat =
+        (msgs.open) (name, loc);
+
+    RW_ASSERT (! (cat < 0));
+
+    (msgs.close) (cat);
+}
+
+template <class T>
+void test_get (const std::messages<T>& msgs,
+               const std::messages_base::catalog cat,
+               int set, int msgid,
+               const std::basic_string<T>& dflt)
+{
+    // the msg_id() thing seems like a bug to me. if anything, the user
+    // should never need to write or call msg_id().
+
+    const typename std::messages<T>::string_type res =
+        msgs.get (cat, set, msg_id (set, msgid), dflt);
+
+    RW_ASSERT (!rw_strncmp (messages [set-1][msgid-1], res.c_str ()));
+}
+
+/**************************************************************************/
+
+extern "C" {
+
+bool test_char;    // exercise messages<char>
+bool test_wchar;   // exercise messages<wchar_t>
+
+static void*
+thread_func (void*)
+{
+    const std::string name (CAT_NAME);
+
+    const std::messages<char>& nmsgs =
+        std::use_facet<std::messages<char> >(locale);
+
+    const std::string ndflt ("\1\2\3\4");
+
+#ifndef _RWSTD_NO_WCHAR_T
+    const std::messages<wchar_t>& wmsgs =
+        std::use_facet<std::messages<wchar_t> >(locale);
+
+    const std::wstring wdflt (L"\1\2\3\4");
+#endif // _RWSTD_NO_WCHAR_T
+
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        int set   = 1 + i % MAX_SETS;
+        int msgid = 1 + i % MAX_MESSAGES;
+
+        if (test_char) {
+            if (i & 1) {
+                test_get<char>(nmsgs, catalog, set, msgid, ndflt);
+            }
+            else {
+                test_open_close<char>(locale, nmsgs, name);
+            }
+        }
+
+        if (test_wchar) {
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            if (i & 1) {
+                test_get<wchar_t>(wmsgs, wcatalog, set, msgid, wdflt);
+            }
+            else {
+                test_open_close<wchar_t>(locale, wmsgs, name);
+            }
+
+#endif // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    for (int i = 0; i < MAX_SETS; ++i) {
+        for (int j = 0; j < MAX_MESSAGES; ++j)
+            str_messages.append (messages [i][j], std::strlen (messages [i][j]) + 1);
+
+        str_messages.append (1, '\0');
+    }
+
+    // generate a message catalog
+    rw_create_catalog (MSG_NAME, str_messages.c_str ());
+    const std::string name (CAT_NAME);
+
+    const std::messages<char>& nmsgs =
+        std::use_facet<std::messages<char> >(locale);
+
+    catalog = (nmsgs.open) (name, locale);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    const std::messages<wchar_t>& wmsgs =
+        std::use_facet<std::messages<wchar_t> >(locale);
+
+    wcatalog = (wmsgs.open) (name, locale);
+
+#endif
+
+    rw_info (0, 0, 0,
+             "testing std::messages<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops);
+
+    ///////////////////////////////////////////////////////////////////////
+
+    test_char   = true;
+    test_wchar  = false;
+
+    rw_info (0, 0, 0, "exercising std::messages<char>");
+
+    int result = 
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0,
+                        thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    ///////////////////////////////////////////////////////////////////////
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    test_char   = false;
+    test_wchar  = true;
+
+    rw_info (0, 0, 0, "exercising std::messages<wchar_t>");
+
+    result = 
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0,
+                        thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    ///////////////////////////////////////////////////////////////////////
+
+    test_char   = true;
+    test_wchar  = true;
+
+    rw_info (0, 0, 0, "exercising std::messages<char> and "
+                      "std::messages<wchar_t>");
+
+    result = 
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0,
+                        thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif // _RWSTD_NO_WCHAR_T
+
+    ///////////////////////////////////////////////////////////////////////
+
+    (nmsgs.close) (catalog);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    (wmsgs.close) (wcatalog);
+    
+#endif // _RWSTD_NO_WCHAR_T
+
+    std::remove (CAT_NAME);
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.messages",
+                    "thread safety", run_test,
+                    "|-nloops#0 "        // must be non-negative
+                    "|-nthreads#0-* ",    // must be in [0, MAX_THREADS]
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads);
+}
diff --git a/tests/localization/22.locale.money.get.cpp b/tests/localization/22.locale.money.get.cpp
index 23c80c0..b6a9d27 100644
--- a/tests/localization/22.locale.money.get.cpp
+++ b/tests/localization/22.locale.money.get.cpp
@@ -241,8 +241,30 @@
 
 /**************************************************************************/
 
+std::money_base::pattern
+set_pattern (const char *format)
+{
+    std::money_base::pattern pat;
+
+    for (unsigned i = 0; i != sizeof pat.field / sizeof *pat.field; ++i) {
+        switch (format [i]) {
+        case '\0': case '@': pat.field [i] = std::money_base::none; break;
+        case '\1': case ' ': pat.field [i] = std::money_base::space; break;
+        case '\2': case '$': pat.field [i] = std::money_base::symbol; break;
+        case '\3': case '-': pat.field [i] = std::money_base::sign; break;
+        case '\4': case '1': pat.field [i] = std::money_base::value; break;
+        default:
+            _RWSTD_ASSERT (!!"bad format specifier");
+        }
+    }
+
+    return pat;
+}
+
+
 template <class charT>
-void do_test (charT       which,   // which overload to exercise
+void do_test (bool        intl,    // international?
+              charT       which,   // which overload to exercise
               const char *cname,   // the name of the charT type
               const char *tname,   // the name of the floating point type
               int         lineno,  // line number
@@ -254,8 +276,7 @@
               int         frac_digits = 0, // fractional digits
               const char *fmat = 0,        // money_base::pattern
               const char *cursym = 0,      // currency symbol
-              const char *grouping = "",   // grouping string
-              bool intl = false)           // international?
+              const char *grouping = "")   // grouping string
 {
     if (!rw_enabled (lineno)) {
         rw_note (0, __FILE__, __LINE__, "test on line %d disabled", lineno);
@@ -271,6 +292,8 @@
 
         fmat = pat.field;
     }
+    else
+        fmat = set_pattern (fmat).field;
 
     // local format? (the opposite of interantional)
     const bool locl = !intl;
@@ -448,11 +471,13 @@
 
 
 template <class charT>
-void test_get (charT opt, const char *cname, const char *tname)
+void test_get (charT opt, const char *cname, const char *tname, bool intl)
 {
-#define T      opt, cname, tname, __LINE__
+#define T      intl, opt, cname, tname, __LINE__
 #define TEST   do_test
 
+    const bool locl = !intl;
+
     rw_info (0, 0, 0,
              "money_get<%s, istreambuf_iterator<%s> >::get "
              "(..., %s&) const", cname, cname, tname);
@@ -466,12 +491,12 @@
     // by decimal_point(). The other symbols are defined as follows:
     //     units ::= digits [ thousandssep units ] digits ::= adigit [ digits ]
 
-    PunctData<charT>::positive_sign_ [0] = 0;
-    PunctData<charT>::positive_sign_ [1] = 0;
-    PunctData<charT>::negative_sign_ [0] = 0;
-    PunctData<charT>::negative_sign_ [1] = 0;
-    PunctData<charT>::thousands_sep_ [0] = '\0';
-    PunctData<charT>::thousands_sep_ [1] = '\0';
+    PunctData<charT>::positive_sign_ [intl] = 0;
+    PunctData<charT>::positive_sign_ [locl] = 0;
+    PunctData<charT>::negative_sign_ [intl] = 0;
+    PunctData<charT>::negative_sign_ [locl] = 0;
+    PunctData<charT>::thousands_sep_ [intl] = '\0';
+    PunctData<charT>::thousands_sep_ [locl] = '\0';
 
     // parsing zero, no curr_symbol or sign, default pattern, 0 frac_digits
     TEST (T, 0.0, "0",   1, 0, eofbit);
@@ -539,8 +564,8 @@
     TEST (T,  54321098.0, "5432.1098", 9, 0, eofbit, 4);
     TEST (T, 432109870.0, "43210.987", 9, 0, eofbit, 4);
 
-    PunctData<charT>::thousands_sep_ [0] = ',';
-    PunctData<charT>::thousands_sep_ [1] = ';';
+    PunctData<charT>::thousands_sep_ [intl] = ',';
+    PunctData<charT>::thousands_sep_ [locl] = ';';
 
     // parsing with thousands_sep and/or grouping
     TEST (T,      0.0, "0",        1, 0, eofbit,  0, 0, "", "\1");
@@ -614,10 +639,10 @@
     static const charT plus[][2]  = { { '+', '\0' }, { '\0' } };
     static const charT minus[][2] = { { '-', '\0' }, { '\0' } };
 
-    PunctData<charT>::positive_sign_ [0] = plus [0];
-    PunctData<charT>::negative_sign_ [0] = minus [0];
-    PunctData<charT>::positive_sign_ [1] = plus [1];
-    PunctData<charT>::negative_sign_ [1] = minus [1];
+    PunctData<charT>::positive_sign_ [intl] = plus [0];
+    PunctData<charT>::negative_sign_ [intl] = minus [0];
+    PunctData<charT>::positive_sign_ [locl] = plus [1];
+    PunctData<charT>::negative_sign_ [locl] = minus [1];
 
     TEST (T,  15.0, "+15",     3, 0, eofbit,  0, 0, "");
     TEST (T,  16.0, "+ 16",    4, 0, eofbit,  0, 0, "");
@@ -647,10 +672,10 @@
     static const charT plus_plus[][3]   = { { '+', '+', '\0' }, { '\0' } };
     static const charT minus_minus[][3] = { { '-', '-', '\0' }, { '\0' } };
 
-    PunctData<charT>::positive_sign_ [0] = plus_plus [0];
-    PunctData<charT>::negative_sign_ [0] = minus_minus [0];
-    PunctData<charT>::positive_sign_ [1] = plus_plus [1];
-    PunctData<charT>::negative_sign_ [1] = minus_minus [1];
+    PunctData<charT>::positive_sign_ [intl] = plus_plus [0];
+    PunctData<charT>::negative_sign_ [intl] = minus_minus [0];
+    PunctData<charT>::positive_sign_ [locl] = plus_plus [1];
+    PunctData<charT>::negative_sign_ [locl] = minus_minus [1];
 
     TEST (T,  27.0, "+27+",    4, 0, eofbit, 0, 0, "");
     TEST (T,  28.0, "+  28+",  6, 0, eofbit, 0, 0, "");
@@ -683,10 +708,10 @@
 
     static const charT plus_minus[][3] = { { '+', '-', '\0' }, { '\0' } };
 
-    PunctData<charT>::positive_sign_ [0] = plus_plus [0];
-    PunctData<charT>::positive_sign_ [1] = plus_plus [1];
-    PunctData<charT>::negative_sign_ [0] = plus_minus [0];
-    PunctData<charT>::negative_sign_ [1] = plus_minus [1];
+    PunctData<charT>::positive_sign_ [intl] = plus_plus [0];
+    PunctData<charT>::positive_sign_ [locl] = plus_plus [1];
+    PunctData<charT>::negative_sign_ [intl] = plus_minus [0];
+    PunctData<charT>::negative_sign_ [locl] = plus_minus [1];
 
     // 22.2.6.1.2, p3: if the first character of positive
     // and negative sign is the same, the result is positive
@@ -694,98 +719,98 @@
     TEST (T, 41.0,   "+41-", 4, 0,        eofbit,  0, 0, "");
     TEST (T, 42.0,  "+42+ ", 4, 0,        goodbit, 0, 0, "");
     TEST (T, 43.0,  "+43- ", 4, 0,        goodbit, 0, 0, "");
-    TEST (T, 44.0, "+44 $+", 6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T, 45.0, "+45 $-", 6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T, 46.0, "+46$+ ", 5, showbase, goodbit, 0, "\3\4\2\0", "$");
-    TEST (T, 47.0, "+47$- ", 5, showbase, goodbit, 0, "\3\4\2\0", "$");
+    TEST (T, 44.0, "+44 $+", 6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T, 45.0, "+45 $-", 6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T, 46.0, "+46$+ ", 5, showbase, goodbit, 0, "-1$@", "$");
+    TEST (T, 47.0, "+47$- ", 5, showbase, goodbit, 0, "-1$@", "$");
 
     // none = 0, space = 1, symbol = 2, sign = 3, value = 4
 
     // test various patterns
-    PunctData<charT>::positive_sign_ [0] = plus [0];
-    PunctData<charT>::positive_sign_ [1] = plus [1];
-    PunctData<charT>::negative_sign_ [0] = minus [0];
-    PunctData<charT>::negative_sign_ [1] = minus [1];
+    PunctData<charT>::positive_sign_ [intl] = plus [0];
+    PunctData<charT>::positive_sign_ [locl] = plus [1];
+    PunctData<charT>::negative_sign_ [intl] = minus [0];
+    PunctData<charT>::negative_sign_ [locl] = minus [1];
 
-    TEST (T,  -100.0, "$-1",   3, showbase, eofbit,  2, "\2\3\4\0", "$");
-    TEST (T,  -200.0, "$-2 ",  3, showbase, goodbit, 2, "\2\3\4\0", "$");
+    TEST (T,  -100.0, "$-1",   3, showbase, eofbit,  2, "$-1@", "$");
+    TEST (T,  -200.0, "$-2 ",  3, showbase, goodbit, 2, "$-1@", "$");
     // where none appears in the pattern, whitespace is optional
-    TEST (T,  -300.0, "-3$",   3, showbase, eofbit,  2, "\3\4\0\2", "$");
-    TEST (T,  -400.0, "-4 $",  4, showbase, eofbit,  2, "\3\4\0\2", "$");
+    TEST (T,  -300.0, "-3$",   3, showbase, eofbit,  2, "-1@$", "$");
+    TEST (T,  -400.0, "-4 $",  4, showbase, eofbit,  2, "-1@$", "$");
     // where space appears in the pattern, a whitespace character is required
-    TEST (T,    0.0, "-5$",    2, showbase, failbit, 2, "\3\4\1\2", "$");
-    TEST (T,  -600.0, "-6 $",  4, showbase, eofbit,  2, "\3\4\1\2", "$");
-    TEST (T,  -700.0, "-7\t$", 4, showbase, eofbit,  2, "\3\4\1\2", "$");
+    TEST (T,    0.0, "-5$",    2, showbase, failbit, 2, "-1 $", "$");
+    TEST (T,  -600.0, "-6 $",  4, showbase, eofbit,  2, "-1 $", "$");
+    TEST (T,  -700.0, "-7\t$", 4, showbase, eofbit,  2, "-1 $", "$");
 
-    TEST (T,     0.0, "-8$",   1, showbase, failbit, 2, "\3\1\4\2", "$");
-    TEST (T,  -900.0, "-\n9$", 4, showbase, eofbit,  2, "\3\1\4\2", "$");
-    TEST (T, -1000.0, "- 10$", 5, showbase, eofbit,  2, "\3\1\4\2", "$");
+    TEST (T,     0.0, "-8$",   1, showbase, failbit, 2, "- 1$", "$");
+    TEST (T,  -900.0, "-\n9$", 4, showbase, eofbit,  2, "- 1$", "$");
+    TEST (T, -1000.0, "- 10$", 5, showbase, eofbit,  2, "- 1$", "$");
     // white space is required even at the beginning of input
     // (if the optional sign or symbol is missing)
-    TEST (T,     0.0, "11$",   0, showbase, failbit, 2, "\3\1\4\2", "$");
+    TEST (T,     0.0, "11$",   0, showbase, failbit, 2, "- 1$", "$");
 
-    TEST (T, -1200.0, "12$-",  4, showbase, eofbit,  2, "\4\0\2\3", "$");
-    TEST (T, -1300.0, "13 $-", 5, showbase, eofbit,  2, "\4\0\2\3", "$");
-    TEST (T,     0.0, "14$-",  2, showbase, failbit, 2, "\4\1\2\3", "$");
-    TEST (T, -1500.0, "15 $-", 5, showbase, eofbit,  2, "\4\1\2\3", "$");
+    TEST (T, -1200.0, "12$-",  4, showbase, eofbit,  2, "1@$-", "$");
+    TEST (T, -1300.0, "13 $-", 5, showbase, eofbit,  2, "1@$-", "$");
+    TEST (T,     0.0, "14$-",  2, showbase, failbit, 2, "1 $-", "$");
+    TEST (T, -1500.0, "15 $-", 5, showbase, eofbit,  2, "1 $-", "$");
 
     const charT parens[][3] = { { '(', ')', '\0' }, { '\0' } };
-    PunctData<charT>::negative_sign_ [0] = parens [0];
-    PunctData<charT>::negative_sign_ [1] = parens [1];
+    PunctData<charT>::negative_sign_ [intl] = parens [0];
+    PunctData<charT>::negative_sign_ [locl] = parens [1];
 
     // { sign, space, value, symbol }, with symbol required
-    TEST (T, -90.0, "( 9$)",    5, showbase, eofbit, 1, "\3\1\4\2", "$");
-    TEST (T, -80.0, "( 8SIT)",  7, showbase, eofbit, 1, "\3\1\4\2", "SIT");
-    TEST (T, -81.0, "( 8.1Fr)", 8, showbase, eofbit, 1, "\3\1\4\2", "Fr");
-    TEST (T,  70.0, " 7Ptas",   6, showbase, eofbit, 1, "\3\1\4\2", "Ptas");
-    TEST (T,  61.0, " 6.1Lek",  7, showbase, eofbit, 1, "\3\1\4\2", "Lek");
+    TEST (T, -90.0, "( 9$)",    5, showbase, eofbit, 1, "- 1$", "$");
+    TEST (T, -80.0, "( 8SIT)",  7, showbase, eofbit, 1, "- 1$", "SIT");
+    TEST (T, -81.0, "( 8.1Fr)", 8, showbase, eofbit, 1, "- 1$", "Fr");
+    TEST (T,  70.0, " 7Ptas",   6, showbase, eofbit, 1, "- 1$", "Ptas");
+    TEST (T,  61.0, " 6.1Lek",  7, showbase, eofbit, 1, "- 1$", "Lek");
 
     // { sign, value, none, symbol }
-    TEST (T,  101.0, "101    ", 3, 0,        goodbit, 0, "\3\4\0\2", "");
+    TEST (T,  101.0, "101    ", 3, 0,        goodbit, 0, "-1@$", "");
     // trailing space not extracted since currency symbol is optional
-    TEST (T,  102.0, "102 ", 3, 0, goodbit, 0, "\3\4\0\2", " ");
+    TEST (T,  102.0, "102 ", 3, 0, goodbit, 0, "-1@$", " ");
     // all spaces extracted since currency symbol (last) is mandatory
     // verify that the facet doesn't extract too many optional spaces
     // leaving none for the final required currency symbol
-    TEST (T,  103.0, "103 ", 4, showbase, eofbit, 0, "\3\4\0\2", " ");
+    TEST (T,  103.0, "103 ", 4, showbase, eofbit, 0, "-1@$", " ");
 
     // 22.2.6.1.2, p3: [Example: If showbase is off, then for
     // a negative sign value of "()" and a currency symbol of "L",
     // in "(100 L)" the "L" is consumed; but if negative sign is "­",
     // the "L" in "­100 L" is not consumed. ]
-    TEST (T, -104.0, "(104 L)", 7, 0,        eofbit,  0, "\3\4\0\2", "L");
-    TEST (T, -105.0, "(105 L)", 7, showbase, eofbit,  0, "\3\4\0\2", "L");
+    TEST (T, -104.0, "(104 L)", 7, 0,        eofbit,  0, "-1@$", "L");
+    TEST (T, -105.0, "(105 L)", 7, showbase, eofbit,  0, "-1@$", "L");
 
-    PunctData<charT>::positive_sign_ [0] = plus [0];
-    PunctData<charT>::negative_sign_ [0] = minus [0];
-    PunctData<charT>::positive_sign_ [1] = plus [1];
-    PunctData<charT>::negative_sign_ [1] = minus [1];
+    PunctData<charT>::positive_sign_ [intl] = plus [0];
+    PunctData<charT>::negative_sign_ [intl] = minus [0];
+    PunctData<charT>::positive_sign_ [locl] = plus [1];
+    PunctData<charT>::negative_sign_ [locl] = minus [1];
 
     // { sign, value, none, symbol }
     // trailing optional curr_symbol or whitespace preceding it (regardless
     // of whether the latter is required or optional) is not consumed)
-    TEST (T, -101.0, "-101 $", 4, 0,        goodbit, 0, "\3\4\0\2", "$");
-    TEST (T, -102.0, "-102 $", 6, showbase, eofbit, 0, "\3\4\0\2", "$");
+    TEST (T, -101.0, "-101 $", 4, 0,        goodbit, 0, "-1@$", "$");
+    TEST (T, -102.0, "-102 $", 6, showbase, eofbit, 0, "-1@$", "$");
 
-    TEST (T, -103.0, "-103 $", 4, 0,        goodbit, 0, "\3\4\1\2", "$");
-    TEST (T, -104.0, "-104 $", 6, showbase, eofbit, 0, "\3\4\1\2", "$");
+    TEST (T, -103.0, "-103 $", 4, 0,        goodbit, 0, "-1 $", "$");
+    TEST (T, -104.0, "-104 $", 6, showbase, eofbit, 0, "-1 $", "$");
 
     // { sign, value, symbol, none }
-    TEST (T, -105.0, "-105 $", 4, 0,        goodbit, 0, "\3\4\2\0", "$");
-    TEST (T, -106.0, "-106$ ", 5, showbase, goodbit, 0, "\3\4\2\0", "$");
+    TEST (T, -105.0, "-105 $", 4, 0,        goodbit, 0, "-1$@", "$");
+    TEST (T, -106.0, "-106$ ", 5, showbase, goodbit, 0, "-1$@", "$");
 
     // { value, none, sign, symbol }
     // trailing whitespace may need to be extracted if characters may
     // be needed to complete the pattern (e.g., sign or symbol)
-    TEST (T,  107.0, "107 $",  4, 0,        goodbit, 0, "\4\0\3\2", "$");
+    TEST (T,  107.0, "107 $",  4, 0,        goodbit, 0, "1@-$", "$");
     // trailing optional curr_symbol is not consumed
-    TEST (T, -108.0, "108-$",  4, 0,        goodbit, 0, "\4\0\3\2", "$");
+    TEST (T, -108.0, "108-$",  4, 0,        goodbit, 0, "1@-$", "$");
     // trailing required curr_symbol is consumed
-    TEST (T, -109.0, "109-$",  5, showbase, eofbit,  0, "\4\0\3\2", "$");
+    TEST (T, -109.0, "109-$",  5, showbase, eofbit,  0, "1@-$", "$");
 
     const charT minus_space[][3] = { { '-', ' ', '\0' }, { '\0' } };
-    PunctData<charT>::negative_sign_ [0] = minus_space [0];
-    PunctData<charT>::negative_sign_ [1] = minus_space [1];
+    PunctData<charT>::negative_sign_ [intl] = minus_space [0];
+    PunctData<charT>::negative_sign_ [locl] = minus_space [1];
 
     // { sign, value, none, symbol }
     // negative_sign is "- ", (note the single trailing space)
@@ -793,70 +818,70 @@
     // specifier that's last in the pattern doesn't confuse the facet into
     // extracting all the optional whitespace, leaving none to complete
     // the negative_sign
-    TEST (T, -109.1, "-109  ", 6, 0, eofbit, 0, "\3\4\0\2", "");
+    TEST (T, -109.1, "-109  ", 6, 0, eofbit, 0, "-1@$", "");
 
     // verify that optional space after value and before currency
     // symbol is treated correctly
-    PunctData<charT>::positive_sign_ [0] = plus_plus [0];
-    PunctData<charT>::positive_sign_ [1] = 0;
-    PunctData<charT>::negative_sign_ [0] = 0;
-    PunctData<charT>::negative_sign_ [1] = 0;
+    PunctData<charT>::positive_sign_ [intl] = plus_plus [0];
+    PunctData<charT>::positive_sign_ [locl] = 0;
+    PunctData<charT>::negative_sign_ [intl] = 0;
+    PunctData<charT>::negative_sign_ [locl] = 0;
 
     // { sign, value, none, symbol }
-    TEST (T,  1090.0, "1090 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T,  1091.0, "1091 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T, +1092.0, "+1092 $+", 8, showbase, eofbit,  0, "\3\4\0\2", "$");
+    TEST (T,  1090.0, "1090 $",   6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T,  1091.0, "1091 $",   6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T, +1092.0, "+1092 $+", 8, showbase, eofbit,  0, "-1@$", "$");
 
-    PunctData<charT>::positive_sign_ [0] = 0;
-    PunctData<charT>::positive_sign_ [1] = 0;
-    PunctData<charT>::negative_sign_ [0] = parens [0];
-    PunctData<charT>::negative_sign_ [1] = 0;
+    PunctData<charT>::positive_sign_ [intl] = 0;
+    PunctData<charT>::positive_sign_ [locl] = 0;
+    PunctData<charT>::negative_sign_ [intl] = parens [0];
+    PunctData<charT>::negative_sign_ [locl] = 0;
 
-    TEST (T,  1093.0, "1093 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T,  1094.0, "1094 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T, -1095.0, "(1095 $)", 8, showbase, eofbit,  0, "\3\4\0\2", "$");
+    TEST (T,  1093.0, "1093 $",   6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T,  1094.0, "1094 $",   6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T, -1095.0, "(1095 $)", 8, showbase, eofbit,  0, "-1@$", "$");
 
     // verify a single-char sign with a multichar one (see bug #428)
-    PunctData<charT>::positive_sign_ [0] = plus [0];
-    PunctData<charT>::positive_sign_ [1] = 0;
-    PunctData<charT>::negative_sign_ [0] = parens [0];
-    PunctData<charT>::negative_sign_ [1] = 0;
+    PunctData<charT>::positive_sign_ [intl] = plus [0];
+    PunctData<charT>::positive_sign_ [locl] = 0;
+    PunctData<charT>::negative_sign_ [intl] = parens [0];
+    PunctData<charT>::negative_sign_ [locl] = 0;
 
     // { sign, value, none, symbol }
-    TEST (T,  1096.0, "1096 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T,  1097.0, "1097 $",   6, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T, +1098.0, "+1098 $",  7, showbase, eofbit,  0, "\3\4\0\2", "$");
-    TEST (T, -1099.0, "(1099 $)", 8, showbase, eofbit,  0, "\3\4\0\2", "$");
+    TEST (T,  1096.0, "1096 $",   6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T,  1097.0, "1097 $",   6, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T, +1098.0, "+1098 $",  7, showbase, eofbit,  0, "-1@$", "$");
+    TEST (T, -1099.0, "(1099 $)", 8, showbase, eofbit,  0, "-1@$", "$");
 
-    PunctData<charT>::positive_sign_ [0] = 0;
-    PunctData<charT>::positive_sign_ [1] = 0;
-    PunctData<charT>::negative_sign_ [0] = 0;
-    PunctData<charT>::negative_sign_ [1] = 0;
+    PunctData<charT>::positive_sign_ [intl] = 0;
+    PunctData<charT>::positive_sign_ [locl] = 0;
+    PunctData<charT>::negative_sign_ [intl] = 0;
+    PunctData<charT>::negative_sign_ [locl] = 0;
 
     // { value, none, symbol, sign }
     // trailing whitespace is not extracted (even if required by the format)
     // if it can be determined that no other characters can possibly complete
     // the format (e.g., if both signs and symbol are empty or if signs are
     // empty and symbol is optional)
-    TEST (T,  110.0, "110 $",  3, 0,        goodbit, 0, "\4\0\3\2", "$");
-    TEST (T,  111.0, "111 $",  3, 0,        goodbit, 0, "\4\1\3\2", "$");
-    TEST (T,  112.0, "112$",   4, showbase, eofbit,  0, "\4\0\3\2", "$");
-    TEST (T,  113.0, "113$",   4, showbase, eofbit,  0, "\4\0\3\2", "$");
-    TEST (T,  114.0, "114 $",  5, showbase, eofbit,  0, "\4\1\3\2", "$");
+    TEST (T,  110.0, "110 $",  3, 0,        goodbit, 0, "1@-$", "$");
+    TEST (T,  111.0, "111 $",  3, 0,        goodbit, 0, "1 -$", "$");
+    TEST (T,  112.0, "112$",   4, showbase, eofbit,  0, "1@-$", "$");
+    TEST (T,  113.0, "113$",   4, showbase, eofbit,  0, "1@-$", "$");
+    TEST (T,  114.0, "114 $",  5, showbase, eofbit,  0, "1 -$", "$");
 
-    TEST (T,  115.0, "115 $",  3, 0,        goodbit, 0, "\4\0\2\3", "$");
-    TEST (T,  116.0, "116 $",  3, 0,        goodbit, 0, "\4\1\2\3", "$");
-    TEST (T,  117.0, "117$",   4, showbase, eofbit,  0, "\4\0\2\3", "$");
-    TEST (T,  118.0, "118$",   4, showbase, eofbit,  0, "\4\0\2\3", "$");
-    TEST (T,  119.0, "119 $",  5, showbase, eofbit,  0, "\4\1\2\3", "$");
+    TEST (T,  115.0, "115 $",  3, 0,        goodbit, 0, "1@$-", "$");
+    TEST (T,  116.0, "116 $",  3, 0,        goodbit, 0, "1 $-", "$");
+    TEST (T,  117.0, "117$",   4, showbase, eofbit,  0, "1@$-", "$");
+    TEST (T,  118.0, "118$",   4, showbase, eofbit,  0, "1@$-", "$");
+    TEST (T,  119.0, "119 $",  5, showbase, eofbit,  0, "1 $-", "$");
 
 
-    PunctData<charT>::positive_sign_ [0] = plus [0];
-    PunctData<charT>::positive_sign_ [1] = plus [1];
-    PunctData<charT>::negative_sign_ [0] = minus [0];
-    PunctData<charT>::negative_sign_ [1] = minus [1];
-    PunctData<charT>::thousands_sep_ [0] = ';';
-    PunctData<charT>::thousands_sep_ [1] = '*';
+    PunctData<charT>::positive_sign_ [intl] = plus [0];
+    PunctData<charT>::positive_sign_ [locl] = plus [1];
+    PunctData<charT>::negative_sign_ [intl] = minus [0];
+    PunctData<charT>::negative_sign_ [locl] = minus [1];
+    PunctData<charT>::thousands_sep_ [intl] = ';';
+    PunctData<charT>::thousands_sep_ [locl] = '*';
 
     // test grouping, default pattern { symbol sign none value }
     TEST (T, 0.0, "$0",     2, 0, eofbit, 0, 0, "$", "\1");
@@ -949,6 +974,19 @@
 
 template <class charT>
 void
+test_get (charT opt, const char *cname, const char *tname)
+{
+    // test local money format
+    test_get (opt, cname, tname, false);
+
+    // test international money format
+    test_get (opt, cname, tname, true);
+}
+
+/**************************************************************************/
+
+template <class charT>
+void
 test_long_double (charT, const char *cname)
 {
     if (rw_enabled ("long double"))
diff --git a/tests/localization/22.locale.money.get.mt.cpp b/tests/localization/22.locale.money.get.mt.cpp
new file mode 100644
index 0000000..141522e
--- /dev/null
+++ b/tests/localization/22.locale.money.get.mt.cpp
@@ -0,0 +1,468 @@
+/************************************************************************
+ *
+ * 22.locale.money.get.mt.cpp
+ *
+ * test exercising the thread safety of the money_get facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <ios>        // for ios
+#include <iterator>   // for ostreambuf_iterator
+#include <locale>     // for locale, money_get
+
+#include <cstring>    // for strlen()
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>
+#include <valcmp.h>    // for rw_strncmp ()
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int rw_opt_nthreads = 1;
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int rw_opt_nloops = 100000;
+
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+//
+struct MyMoneyData
+{
+    enum { BufferSize = 16 };
+
+    enum GetId {
+        get_ldbl,
+        get_string,
+        get_max
+    };
+
+    // name of the locale the data corresponds to
+    const char* locale_name_;
+
+    // optionally set to the named locale for threads to share
+    std::locale locale_;
+
+    // international or domestic format flag
+    bool intl_;
+
+    //
+    long double units_;
+
+    // narrow locale specific representations of units_
+    char ncs_ [BufferSize];
+    std::string ncs_digits_;
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    // wide locale specific representations of units_
+    wchar_t wcs_ [BufferSize];
+    std::wstring wcs_digits_;
+
+#endif // _RWSTD_NO_WCHAR_T
+
+} my_money_data [MAX_THREADS];
+
+
+template <class charT, class Traits>
+struct MyIos: std::basic_ios<charT, Traits>
+{
+    MyIos () {
+        this->init (0);
+    }
+};
+
+
+template <class charT, class Traits>
+struct MyStreambuf: std::basic_streambuf<charT, Traits>
+{
+    typedef std::basic_streambuf<charT, Traits> Base;
+
+    MyStreambuf ()
+        : Base () {
+    }
+
+    void pubsetg (const charT *gbeg, std::streamsize n) {
+        this->setg (_RWSTD_CONST_CAST (charT*, gbeg),
+                    _RWSTD_CONST_CAST (charT*, gbeg),
+                    _RWSTD_CONST_CAST (charT*, gbeg) + n);
+    }
+
+    void pubsetp (charT *pbeg, std::streamsize n) {
+        this->setp (pbeg, pbeg + n);
+    }
+};
+
+
+extern "C" {
+
+bool test_char;    // exercise money_get<char>
+bool test_wchar;   // exercise money_get<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    std::basic_string<char, std::char_traits<char>  > str;
+    nio.rdbuf (&nsb);
+
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    std::basic_string<wchar_t, std::char_traits<wchar_t>  > wstr;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
+
+    std::ios_base::iostate state = std::ios_base::goodbit;
+
+#ifndef _RWSTD_NO_LONG_DOUBLE
+    long double ldbl = 0.;
+#endif  // _RWSTD_NO_LONG_DOUBLE
+
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        // save the name of the locale
+        const MyMoneyData& data = my_money_data [i % nlocales];
+
+        // construct a named locale, get a reference to the money_get
+        // facet from it and use it to format a random money value
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::money_get<char> &ng =
+                std::use_facet<std::money_get<char> >(loc);
+
+            nio.imbue (loc);
+            nsb.pubsetg (data.ncs_, RW_COUNT_OF (data.ncs_));
+
+            if (i & 1) {
+                ng.get (std::istreambuf_iterator<char>(&nsb),
+                        std::istreambuf_iterator<char>(),
+                        data.intl_, nio, state, ldbl);
+                RW_ASSERT (! (state & std::ios_base::failbit));
+                RW_ASSERT (! rw_ldblcmp (ldbl, data.units_));
+            }
+            else {
+                ng.get (std::istreambuf_iterator<char>(&nsb),
+                        std::istreambuf_iterator<char>(),
+                        data.intl_, nio, state, str);
+                RW_ASSERT (! (state & std::ios_base::failbit));
+                RW_ASSERT (! rw_strncmp (str.c_str (),
+                                         data.ncs_digits_.c_str ()));
+            }
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::money_get<wchar_t> &wg =
+                std::use_facet<std::money_get<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetg (data.wcs_, RW_COUNT_OF (data.wcs_));
+
+            if (i & 1) {
+                wg.get (std::istreambuf_iterator<wchar_t>(&wsb),
+                        std::istreambuf_iterator<wchar_t>(),
+                        data.intl_, wio, state, ldbl);
+                RW_ASSERT (! (state & std::ios_base::failbit));
+                RW_ASSERT (! rw_ldblcmp (ldbl, data.units_));
+            }
+            else {
+                wg.get (std::istreambuf_iterator<wchar_t>(&wsb),
+                        std::istreambuf_iterator<wchar_t>(),
+                        data.intl_, wio, state, wstr);
+                RW_ASSERT (! (state & std::ios_base::failbit));
+                RW_ASSERT (! rw_strncmp(wstr.c_str (),
+                                        data.wcs_digits_.c_str ()));
+            }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
+
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
+
+    // find all installed locales for which setlocale (LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    const std::size_t maxinx = RW_COUNT_OF (locales);
+
+    for (const char* name = locale_list;
+         *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+        locales [inx] = name;
+
+        // fill in the money and results for this locale
+        MyMoneyData& data = my_money_data [inx];
+        data.locale_name_ = name;
+
+        try {
+            const std::locale loc (data.locale_name_);
+
+            // exercise domestic formats every other iteration
+            // and international formats the rest
+            data.intl_ = 0 == (inx & 5);
+
+            // initialize with random but valid values
+            long double units = 1.f + inx;
+
+            // exercise postive and negative values
+            if (inx & 1)
+                units += (units * 3.14159);
+            else
+                units -= (units * 2.71828);
+
+            // local scope
+            {
+                const std::money_put<char> &np =
+                    std::use_facet<std::money_put<char> >(loc);
+
+                const std::money_get<char> &ng =
+                    std::use_facet<std::money_get<char> >(loc);
+
+                std::ios::iostate state = std::ios::goodbit;
+
+                nio.imbue (loc);
+
+                // write the value to buffer from long double
+                nsb.pubsetp (data.ncs_, RW_COUNT_OF (data.ncs_));
+                *np.put (std::ostreambuf_iterator<char>(&nsb),
+                         data.intl_, nio, ' ', units) = '\0';
+
+                rw_fatal (!nio.fail (), __FILE__, __LINE__,
+                          "money_put<char>::put(...) "
+                          "failed for locale(%#s)", data.locale_name_);
+
+                // read the value back so threads know what to expect
+                nsb.pubsetg (data.ncs_, RW_COUNT_OF (data.ncs_));
+                ng.get (std::istreambuf_iterator<char>(&nsb),
+                        std::istreambuf_iterator<char>(),
+                        data.intl_, nio, state, data.units_);
+
+                // read back as string, again for threads
+                nsb.pubsetg (data.ncs_, RW_COUNT_OF (data.ncs_));
+                ng.get (std::istreambuf_iterator<char>(&nsb),
+                        std::istreambuf_iterator<char>(),
+                        data.intl_, nio, state, data.ncs_digits_);
+
+                if (state & std::ios_base::failbit)
+                    continue;
+            }
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            // local scope
+            {
+                const std::money_put<wchar_t> &wp =
+                    std::use_facet<std::money_put<wchar_t> >(loc);
+
+                const std::money_get<wchar_t> &wg =
+                    std::use_facet<std::money_get<wchar_t> >(loc);
+
+                std::ios::iostate state = std::ios::goodbit;
+
+                wio.imbue (loc);
+
+                // write the value to buffer from long double
+                wsb.pubsetp (data.wcs_, RW_COUNT_OF (data.wcs_));
+                *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                         data.intl_, wio, L' ', units) = L'\0';
+
+                rw_fatal (!nio.fail (), __FILE__, __LINE__,
+                           "money_put<wchar_t>::put(...) "
+                           "failed for locale(%#s)", data.locale_name_);
+
+                // read back as string, again for threads
+                wsb.pubsetg (data.wcs_, RW_COUNT_OF (data.wcs_));
+                wg.get (std::istreambuf_iterator<wchar_t>(&wsb),
+                        std::istreambuf_iterator<wchar_t>(),
+                        data.intl_, wio, state, data.wcs_digits_);
+
+                if (state & std::ios_base::failbit)
+                    continue;
+            }
+
+#endif // _RWSTD_NO_WCHAR_T
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
+            break;
+    }
+
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
+    rw_info (0, 0, 0,
+             "testing std::money_get<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             nlocales, int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::money_get<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result = 
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::money_get<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise both the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::money_get<char> "
+             "and std::money_get<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.money.get",
+                    "thread safety", run_test,
+                    "|-nloops#0 "        // must be non-negative
+                    "|-nthreads#0-* "    // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "      // arg must be non-negative
+                    "|-locales= "        // must be provided
+                    "|-shared-locale# ",
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
+}
diff --git a/tests/localization/22.locale.money.put.mt.cpp b/tests/localization/22.locale.money.put.mt.cpp
index e175624..f8eed87 100644
--- a/tests/localization/22.locale.money.put.mt.cpp
+++ b/tests/localization/22.locale.money.put.mt.cpp
@@ -35,23 +35,28 @@
 #include <rw_locale.h>
 #include <rw_thread.h>
 #include <driver.h>
+#include <valcmp.h>    // for rw_strncmp ()
 
 
 // maximum number of threads allowed by the command line interface
-#define MAX_THREADS   32
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
 
-
-#ifdef _RWSTD_REENTRANT
-int rw_opt_nthreads = 4;
-#else   // if !defined (_RWSTD_REENTRANT)
-// in non-threaded builds use just one thread
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
 int rw_opt_nthreads = 1;
-#endif   // _RWSTD_REENTRANT
 
 // the number of times each thread should iterate (unless specified
 // otherwise on the command line)
 int rw_opt_nloops = 100000;
 
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
+
 /**************************************************************************/
 
 // array of locale names to use for testing
@@ -64,6 +69,88 @@
 
 /**************************************************************************/
 
+static const char n_money_vals[][20] = {
+    "1", "12", "123", "1234", "12345", "123456", "1234567", "12345678",
+    "-9", "-98", "-987", "-9876", "-98765", "-987654", "-9876543",
+    "1.9", "-12.89", "123.789", "-1234.6789", "-12345.56789"
+};
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+static const wchar_t w_money_vals[][20] = {
+    L"1", L"12", L"123", L"1234", L"12345", L"123456", L"1234567",
+    L"-9", L"-98", L"-987", L"-9876", L"-98765", L"-987654", L"-9876543",
+    L"1.9", L"-12.89", L"123.789", L"-1234.6789", L"-12345.56789"
+};
+
+#endif  // _RWSTD_NO_WCHAR_T
+
+//
+struct MyMoneyData
+{
+    enum { BufferSize = 16 };
+
+    enum PutId {
+        put_ldbl,
+        put_string,
+        put_max
+    };
+
+    // name of the locale the data corresponds to
+    const char* locale_name_;
+
+    // optionally set to the named locale for threads to share
+    std::locale locale_;
+
+    // international or domestic format flag
+    bool intl_;
+
+    // the time struct used to generate strings below
+    double money_value_;
+
+    // type of the data we created string from
+    PutId type_;
+
+    // index into string array [n,w]_money_vals
+    unsigned money_index_;
+
+    // narrow representations of money_
+    char ncs_ [BufferSize];
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    // wide representations of money_
+    wchar_t wcs_ [BufferSize];
+
+#endif // _RWSTD_NO_WCHAR_T
+
+} my_money_data [MAX_THREADS];
+
+
+template <class charT, class Traits>
+struct MyIos: std::basic_ios<charT, Traits>
+{
+    MyIos () {
+        this->init (0);
+    }
+};
+
+
+template <class charT, class Traits>
+struct MyStreambuf: std::basic_streambuf<charT, Traits>
+{
+    typedef std::basic_streambuf<charT, Traits> Base;
+
+    MyStreambuf ()
+        : Base () {
+    }
+
+    void pubsetp (charT *pbeg, std::streamsize n) {
+        this->setp (pbeg, pbeg + n);
+    }
+};
+
+
 extern "C" {
 
 bool test_char;    // exercise money_put<char>
@@ -73,88 +160,57 @@
 static void*
 thread_func (void*)
 {
-    // dummy streambuf-derived object the doesn't do anything
-    // but allows ostreambuf_iterator to "think" it can write
-    // to it
-    struct NarrowBuf: std::streambuf {
-        int_type overflow (int_type c) { return c; }
-    } sb;
-
-    const char str_vals[][20] = {
-        "1", "12", "123", "1234", "12345", "123456", "1234567", "12345678",
-        "-9", "-98", "-987", "-9876", "-98765", "-987654", "-9876543",
-        "1.9", "-12.89", "123.789", "-1234.6789", "-12345.56789"
-    };
+    char             ncs [MyMoneyData::BufferSize];
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
 
 #ifndef _RWSTD_NO_WCHAR_T
-
-    struct WideBuf: std::wstreambuf {
-        int_type overflow (int_type c) { return c; }
-    } wb;
-
-    const wchar_t wstr_vals[][20] = {
-        L"1", L"12", L"123", L"1234", L"12345", L"123456", L"1234567",
-        L"-9", L"-98", L"-987", L"-9876", L"-98765", L"-987654", L"-9876543",
-        L"1.9", L"-12.89", L"123.789", L"-1234.6789", L"-12345.56789"
-    };
-
-#endif   // _RWSTD_NO_WCHAR_T
-
-    struct Ios: std::ios {
-        Ios () { this->init (0); }
-    } io;
+    wchar_t                wcs [MyMoneyData::BufferSize];
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
 
     for (int i = 0; i != rw_opt_nloops; ++i) {
 
         // save the name of the locale
-        const char* const locale_name = locales [i % nlocales];
+        const MyMoneyData& data = my_money_data [i % nlocales];
 
-        // construct a named locale and imbue it in the ios object
-        // so that the locale is used not only by the money_put facet
-        // but also by the numpunct facet
-        const std::locale loc (locale_name);
-        io.imbue (loc);
-
-        enum PutId {
-            put_ldbl,
-            put_string,
-            put_max
-        };
-
-        io.width (i % 16);
-
-        // exercise postive and negative values
-        long double ldval = i & 1 ? -i : i;
-
-        // add some random fractional digits
-        if (i & 2)
-            ldval += ldval / 3.14;
-
-        // exercise domestic formats every other iteration
-        // and international formats the rest
-        const bool intl = 0 == (i & 1);
+        // construct a named locale, get a reference to the money_put
+        // facet from it and use it to format a random money value
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
 
         if (test_char) {
             // exercise the narrow char specialization of the facet
 
-            const std::money_put<char> &mp =
+            const std::money_put<char> &np =
                 std::use_facet<std::money_put<char> >(loc);
 
-            const std::ostreambuf_iterator<char> iter (&sb);
+            nio.imbue (loc);
+            nsb.pubsetp (ncs, RW_COUNT_OF (ncs));
 
-            switch (PutId (i % put_max)) {
-            case put_ldbl:
-                mp.put (iter, intl, io, ' ', ldval);
+            switch (data.type_) {
+            case MyMoneyData::put_ldbl:
+                *np.put (std::ostreambuf_iterator<char>(&nsb),
+                         data.intl_, nio, ' ', data.money_value_) = '\0';
                 break;
-
-            case put_string: {
-                const char* const strval =
-                    str_vals [i % sizeof str_vals / sizeof *str_vals];
-
-                mp.put (iter, intl, io, ' ', strval);
+            case MyMoneyData::put_string:
+                *np.put (std::ostreambuf_iterator<char>(&nsb),
+                         data.intl_, nio, ' ',
+                         n_money_vals [data.money_index_]) = '\0';
+                break;
+            case MyMoneyData::put_max:
+                // avoid enumeration value `put_max' not handled in switch
+                // this case should never happen
                 break;
             }
-            }
+
+            RW_ASSERT (!nio.fail ());
+            RW_ASSERT (!rw_strncmp (ncs, data.ncs_));
+
         }
 
         // both specializations may be tested at the same time
@@ -164,24 +220,30 @@
 
 #ifndef _RWSTD_NO_WCHAR_T
 
-            const std::money_put<wchar_t> &mp =
+            const std::money_put<wchar_t> &wp =
                 std::use_facet<std::money_put<wchar_t> >(loc);
 
-            const std::ostreambuf_iterator<wchar_t> iter (&wb);
+            wio.imbue (loc);
+            wsb.pubsetp (wcs, RW_COUNT_OF (wcs));
 
-            switch (PutId (i % put_max)) {
-            case put_ldbl:
-                mp.put (iter, intl, io, ' ', ldval);
+            switch (data.type_) {
+            case MyMoneyData::put_ldbl:
+                *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                         data.intl_, wio, ' ', data.money_value_) = L'\0';
                 break;
-
-            case put_string: {
-                const wchar_t* const strval =
-                    wstr_vals [i % sizeof wstr_vals / sizeof *wstr_vals];
-
-                mp.put (iter, intl, io, ' ', strval);
+            case MyMoneyData::put_string:
+                *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                         data.intl_, wio, ' ',
+                         w_money_vals [data.money_index_]) = L'\0';
+                break;
+            case MyMoneyData::put_max:
+                // avoid enumeration value `put_max' not handled in switch
+                // this case should never happen
                 break;
             }
-            }
+
+            RW_ASSERT (!wio.fail ());
+            RW_ASSERT (!rw_strncmp (wcs, data.wcs_));
 
 #endif   // _RWSTD_NO_WCHAR_T
 
@@ -198,23 +260,137 @@
 static int
 run_test (int, char**)
 {
-    char* const locale_list = rw_locales ();
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
 
-    const std::size_t maxinx = sizeof locales / sizeof *locales;
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
 
-    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
-        locales [nlocales++] = name;
+    // find all installed locales for which setlocale (LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
 
-        if (nlocales == maxinx)
+    const std::size_t maxinx = RW_COUNT_OF (locales);
+
+    for (const char* name = locale_list;
+         *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+        locales [inx] = name;
+
+        // fill in the money and results for this locale
+        MyMoneyData& data = my_money_data [inx];
+        data.locale_name_ = name;
+
+        try {
+            const std::locale loc (data.locale_name_);
+
+            // initialize with random but valid values
+
+            data.money_value_ = inx;
+            data.type_ = MyMoneyData::PutId (nlocales % MyMoneyData::put_max);
+            data.money_index_ = inx % RW_COUNT_OF (n_money_vals);
+
+            // exercise domestic formats every other iteration
+            // and international formats the rest
+            data.intl_ = 0 == (inx & 1);
+
+            // exercise postive and negative values
+            if (inx & 1)
+                data.money_value_ *= -1.;
+
+            // add some random fractional digits
+            if (inx & 2)
+                data.money_value_ += data.money_value_ / 3.14;
+
+            const std::money_put<char> &np =
+                std::use_facet<std::money_put<char> >(loc);
+
+            nio.imbue (loc);
+            nsb.pubsetp (data.ncs_, RW_COUNT_OF (data.ncs_));
+            
+            switch (data.type_) {
+            case MyMoneyData::put_ldbl:
+                *np.put (std::ostreambuf_iterator<char>(&nsb),
+                         data.intl_, nio, ' ', data.money_value_) = '\0';
+                break;
+            case MyMoneyData::put_string:
+                *np.put (std::ostreambuf_iterator<char>(&nsb),
+                         data.intl_, nio, ' ',
+                         n_money_vals [data.money_index_]) = '\0';
+                break;
+            case MyMoneyData::put_max:
+                // avoid enumeration value `put_max' not handled in switch
+                // this case should never happen
+                break;
+            }
+
+            rw_assert (!nio.fail (), __FILE__, __LINE__,
+                       "money_put<char>::put(...) "
+                       "failed for locale(%#s)",
+                       data.locale_name_);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::money_put<wchar_t> &wp =
+                std::use_facet<std::money_put<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetp (data.wcs_, RW_COUNT_OF (data.wcs_));
+
+            switch (data.type_) {
+            case MyMoneyData::put_ldbl:
+                *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                         data.intl_, wio, L' ', data.money_value_) = '\0';
+                break;
+            case MyMoneyData::put_string:
+                *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                         data.intl_, wio, L' ',
+                         w_money_vals [data.money_index_]) = L'\0';
+                break;
+            case MyMoneyData::put_max:
+                // avoid enumeration value `put_max' not handled in switch
+                // this case should never happen
+                break;
+            }
+
+            rw_assert (!nio.fail (), __FILE__, __LINE__,
+                       "money_put<wchar_t>::put(...) "
+                       "failed for locale(%#s)",
+                       data.locale_name_);
+
+#endif // _RWSTD_NO_WCHAR_T
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
             break;
     }
 
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
     rw_info (0, 0, 0,
              "testing std::money_put<charT> with %d thread%{?}s%{;}, "
-             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
              rw_opt_nthreads, 1 != rw_opt_nthreads,
              rw_opt_nloops, 1 != rw_opt_nloops,
-             int (nlocales), "%#s", locales);
+             nlocales, int (nlocales), "%#s", locales);
 
     rw_info (0, 0, 0, "exercising std::money_put<char>");
 
@@ -222,7 +398,7 @@
     test_wchar = false;
 
     // create and start a pool of threads and wait for them to finish
-    int result =
+    int result = 
         rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
 
     rw_error (result == 0, 0, __LINE__,
@@ -244,7 +420,7 @@
               "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
               rw_opt_nthreads, thread_func);
 
-    // exercise bothe the char and the wchar_t specializations
+    // exercise both the char and the wchar_t specializations
     // at the same time
 
     rw_info (0, 0, 0,
@@ -271,12 +447,28 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
     return rw_test (argc, argv, __FILE__,
                     "lib.locale.money.put",
                     "thread safety", run_test,
-                    "|-nloops#0 "       // must be non-negative
-                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    "|-nloops#0 "        // must be non-negative
+                    "|-nthreads#0-* "    // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "      // arg must be non-negative
+                    "|-locales= "        // must be provided
+                    "|-shared-locale# ",
                     &rw_opt_nloops,
                     int (MAX_THREADS),
-                    &rw_opt_nthreads);
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
 }
diff --git a/tests/localization/22.locale.moneypunct.mt.cpp b/tests/localization/22.locale.moneypunct.mt.cpp
index 4c22460..0306052 100644
--- a/tests/localization/22.locale.moneypunct.mt.cpp
+++ b/tests/localization/22.locale.moneypunct.mt.cpp
@@ -29,9 +29,8 @@
 #include <ios>        // for ios
 #include <locale>     // for locale, moneypunct
 
-#include <clocale>    // for lconv, localeconv()
-#include <cstdlib>    // for mbstowcs()
-#include <cstring>    // for size_t, strcpy()
+#include <cstdlib>    // for mbstowcs(), size_t
+#include <cstring>    // for strcpy()
 
 #include <rw_locale.h>
 #include <rw_thread.h>
@@ -42,17 +41,16 @@
 // maximum number of threads allowed by the command line interface
 #define MAX_THREADS   32
 
-
-#ifdef _RWSTD_REENTRANT
-int rw_opt_nthreads = 4;
-#else   // if !defined (_RWSTD_REENTRANT)
-// in non-threaded builds use just one thread
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
 int rw_opt_nthreads = 1;
-#endif   // _RWSTD_REENTRANT
 
-// the number of times each thread should iterate (unless specified
-// otherwise on the command line)
-int rw_opt_nloops = 200000;
+// the default number of times for each thread to iterate
+#define DFLT_LOOPS   10000
+
+// the number of times each thread should iterate (will be set to
+// DFLT_LOOPS unless explicitly specified on the command line)
+int rw_opt_nloops = -1;
 
 /**************************************************************************/
 
@@ -97,27 +95,187 @@
 
 } punct_data [MAX_THREADS];
 
-
-extern "C" {
+/**************************************************************************/
 
 bool test_char;    // exercise num_put<char>
 bool test_wchar;   // exercise num_put<wchar_t>
 
+static void
+thread_loop_body (std::size_t i)
+{
+    const std::size_t inx = std::size_t (i) % (nlocales ? nlocales : 1);
+
+    const MoneypunctData* const data = punct_data + inx;
+
+    // construct a named locale
+    const std::locale loc (data->locale_name_);
+
+    if (test_char) {
+        // exercise the narrow char, local specialization of the facet
+
+        typedef std::moneypunct<char, false> Punct;
+
+        const Punct &mp = std::use_facet<Punct>(loc);
+
+        const char           dp  = mp.decimal_point ();
+        const char           ts  = mp.thousands_sep ();
+        const std::string    grp = mp.grouping ();
+        const std::string    cur = mp.curr_symbol ();
+        const std::string    pos = mp.positive_sign ();
+        const std::string    neg = mp.negative_sign ();
+        const int            fd  = mp.frac_digits ();
+        const Punct::pattern pfm = mp.pos_format ();
+        const Punct::pattern nfm = mp.neg_format ();
+
+        RW_ASSERT (dp == data->decimal_point_);
+        RW_ASSERT (ts == data->thousands_sep_);
+        RW_ASSERT (fd == data->frac_digits_);
+        RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+        RW_ASSERT (!rw_strncmp (cur.c_str (), data->curr_symbol_));
+        RW_ASSERT (!rw_strncmp (pos.c_str (), data->positive_sign_));
+        RW_ASSERT (!rw_strncmp (neg.c_str (), data->negative_sign_));
+
+        RW_ASSERT (!std::memcmp (&pfm, data->pos_format_, 4));
+        RW_ASSERT (!std::memcmp (&nfm, data->neg_format_, 4));
+    }
+
+    if (test_char) {
+        // exercise the narrow char, international specialization
+
+        typedef std::moneypunct<char, true> Punct;
+
+        const Punct &mp = std::use_facet<Punct>(loc);
+
+        const char           dp  = mp.decimal_point ();
+        const char           ts  = mp.thousands_sep ();
+        const std::string    grp = mp.grouping ();
+        const std::string    cur = mp.curr_symbol ();
+        const std::string    pos = mp.positive_sign ();
+        const std::string    neg = mp.negative_sign ();
+        const int            fd  = mp.frac_digits ();
+        const Punct::pattern pfm = mp.pos_format ();
+        const Punct::pattern nfm = mp.neg_format ();
+
+        RW_ASSERT (dp == data->decimal_point_);
+        RW_ASSERT (ts == data->thousands_sep_);
+        RW_ASSERT (fd == data->frac_digits_);
+        RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+        RW_ASSERT (!rw_strncmp (cur.c_str (), data->int_curr_symbol_));
+        RW_ASSERT (!rw_strncmp (pos.c_str (), data->positive_sign_));
+        RW_ASSERT (!rw_strncmp (neg.c_str (), data->negative_sign_));
+
+        RW_ASSERT (!std::memcmp (&pfm, data->int_pos_format_, 4));
+        RW_ASSERT (!std::memcmp (&nfm, data->int_neg_format_, 4));
+    }
+
+    // both specializations may be tested at the same time
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    if (test_wchar) {
+        // exercise the wide char, local specialization of the facet
+
+        typedef std::moneypunct<wchar_t, false> Punct;
+
+        const Punct &mp = std::use_facet<Punct>(loc);
+
+        const wchar_t        dp  = mp.decimal_point ();
+        const wchar_t        ts  = mp.thousands_sep ();
+        const std::string    grp = mp.grouping ();
+        const std::wstring   cur = mp.curr_symbol ();
+        const std::wstring   pos = mp.positive_sign ();
+        const std::wstring   neg = mp.negative_sign ();
+        const int            fd  = mp.frac_digits ();
+        const Punct::pattern pfm = mp.pos_format ();
+        const Punct::pattern nfm = mp.neg_format ();
+
+        RW_ASSERT (dp == data->wdecimal_point_);
+        RW_ASSERT (ts == data->wthousands_sep_);
+        RW_ASSERT (fd == data->frac_digits_);
+        RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+        RW_ASSERT (!rw_strncmp (cur.c_str (), data->wcurr_symbol_));
+        RW_ASSERT (!rw_strncmp (pos.c_str (), data->wpositive_sign_));
+        RW_ASSERT (!rw_strncmp (neg.c_str (), data->wnegative_sign_));
+
+        RW_ASSERT (!std::memcmp (&pfm, data->pos_format_, 4));
+        RW_ASSERT (!std::memcmp (&nfm, data->neg_format_, 4));
+    }
+
+    if (test_wchar) {
+        // exercise the wide char, international specialization
+
+        typedef std::moneypunct<wchar_t, true> Punct;
+
+        const Punct &mp = std::use_facet<Punct>(loc);
+
+        const wchar_t        dp  = mp.decimal_point ();
+        const wchar_t        ts  = mp.thousands_sep ();
+        const std::string    grp = mp.grouping ();
+        const std::wstring   cur = mp.curr_symbol ();
+        const std::wstring   pos = mp.positive_sign ();
+        const std::wstring   neg = mp.negative_sign ();
+        const int            fd  = mp.frac_digits ();
+        const Punct::pattern pfm = mp.pos_format ();
+        const Punct::pattern nfm = mp.neg_format ();
+
+        RW_ASSERT (dp == data->wdecimal_point_);
+        RW_ASSERT (ts == data->wthousands_sep_);
+        RW_ASSERT (fd == data->frac_digits_);
+        RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
+        RW_ASSERT (!rw_strncmp (cur.c_str (), data->wint_curr_symbol_));
+        RW_ASSERT (!rw_strncmp (pos.c_str (), data->wpositive_sign_));
+        RW_ASSERT (!rw_strncmp (neg.c_str (), data->wnegative_sign_));
+
+        RW_ASSERT (!std::memcmp (&pfm, data->int_pos_format_, 4));
+        RW_ASSERT (!std::memcmp (&nfm, data->int_neg_format_, 4));
+    }
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+}
+
+
+extern "C" {
 
 static void*
 thread_func (void*)
 {
     for (int i = 0; i != rw_opt_nloops; ++i) {
 
-        const std::size_t inx = std::size_t (i) % nlocales;
+        thread_loop_body (std::size_t (i));
+    }
 
-        const MoneypunctData* const data = punct_data + inx;
+    return 0;
+}
 
-        // construct a named locale
-        const std::locale loc (data->locale_name_);
+}   // extern "C"
 
-        if (test_char) {
-            // exercise the narrow char, local specialization of the facet
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    // find all installed locales for which setlocale(LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    // array of locale names to use for testing
+    const char* locales [sizeof punct_data / sizeof *punct_data];
+
+    const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+    // iterate over locales, initializing a global punct_data array
+    for (const char *name = locale_list; *name; name += std::strlen (name) +1) {
+
+        std::locale loc;
+
+        MoneypunctData* const pdata = punct_data + nlocales;
+
+        pdata->locale_name_ = name;
+        locales [nlocales]  = name;
+
+        try {
+            loc = std::locale (name);
 
             typedef std::moneypunct<char, false> Punct;
 
@@ -133,347 +291,120 @@
             const Punct::pattern pfm = mp.pos_format ();
             const Punct::pattern nfm = mp.neg_format ();
 
-            RW_ASSERT (dp == data->decimal_point_);
-            RW_ASSERT (ts == data->thousands_sep_);
-            RW_ASSERT (fd == data->frac_digits_);
-            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
-            RW_ASSERT (!rw_strncmp (cur.c_str (), data->curr_symbol_));
-            RW_ASSERT (!rw_strncmp (pos.c_str (), data->positive_sign_));
-            RW_ASSERT (!rw_strncmp (neg.c_str (), data->negative_sign_));
+            pdata->decimal_point_ = dp;
+            pdata->thousands_sep_ = ts;
+            pdata->frac_digits_   = fd;
 
-            RW_ASSERT (!std::memcmp (&pfm, data->pos_format_, 4));
-            RW_ASSERT (!std::memcmp (&nfm, data->neg_format_, 4));
+            std::strcpy (pdata->grouping_, grp.c_str ());
+            std::strcpy (pdata->curr_symbol_, cur.c_str ());
+            std::strcpy (pdata->positive_sign_, pos.c_str ());
+            std::strcpy (pdata->negative_sign_, neg.c_str ());
+            std::memcpy (pdata->pos_format_, &pfm, sizeof pfm);
+            std::memcpy (pdata->neg_format_, &nfm, sizeof nfm);
+        }
+        catch (...) {
+            rw_warn (0, 0, __LINE__,
+                     "std::locale(%#s) threw an exception, skipping", name);
+            continue;
         }
 
-        if (test_char) {
-            // exercise the narrow char, international specialization
-
+        try {
             typedef std::moneypunct<char, true> Punct;
 
             const Punct &mp = std::use_facet<Punct>(loc);
 
-            const char           dp  = mp.decimal_point ();
-            const char           ts  = mp.thousands_sep ();
-            const std::string    grp = mp.grouping ();
             const std::string    cur = mp.curr_symbol ();
-            const std::string    pos = mp.positive_sign ();
-            const std::string    neg = mp.negative_sign ();
             const int            fd  = mp.frac_digits ();
             const Punct::pattern pfm = mp.pos_format ();
             const Punct::pattern nfm = mp.neg_format ();
 
-            RW_ASSERT (dp == data->decimal_point_);
-            RW_ASSERT (ts == data->thousands_sep_);
-            RW_ASSERT (fd == data->frac_digits_);
-            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
-            RW_ASSERT (!rw_strncmp (cur.c_str (), data->int_curr_symbol_));
-            RW_ASSERT (!rw_strncmp (pos.c_str (), data->positive_sign_));
-            RW_ASSERT (!rw_strncmp (neg.c_str (), data->negative_sign_));
+            pdata->int_frac_digits_ = fd;
 
-            RW_ASSERT (!std::memcmp (&pfm, data->int_pos_format_, 4));
-            RW_ASSERT (!std::memcmp (&nfm, data->int_neg_format_, 4));
+            std::strcpy (pdata->int_curr_symbol_, cur.c_str ());
+            std::memcpy (pdata->int_pos_format_, &pfm, sizeof pfm);
+            std::memcpy (pdata->int_neg_format_, &nfm, sizeof nfm);
         }
-
-        // both specializations may be tested at the same time
+        catch (...) {
+            rw_warn (0, 0, __LINE__,
+                     "std::locale(%#s) threw an exception, skipping", name);
+            continue;
+        }
 
 #ifndef _RWSTD_NO_WCHAR_T
 
-        if (test_wchar) {
-            // exercise the wide char, local specialization of the facet
-
+        try {
             typedef std::moneypunct<wchar_t, false> Punct;
 
             const Punct &mp = std::use_facet<Punct>(loc);
 
-            const char           dp  = mp.decimal_point ();
-            const char           ts  = mp.thousands_sep ();
-            const std::string    grp = mp.grouping ();
-            const std::wstring   cur = mp.curr_symbol ();
-            const std::wstring   pos = mp.positive_sign ();
-            const std::wstring   neg = mp.negative_sign ();
-            const int            fd  = mp.frac_digits ();
-            const Punct::pattern pfm = mp.pos_format ();
-            const Punct::pattern nfm = mp.neg_format ();
+            const wchar_t      dp  = mp.decimal_point ();
+            const wchar_t      ts  = mp.thousands_sep ();
+            const std::wstring cur = mp.curr_symbol ();
+            const std::wstring pos = mp.positive_sign ();
+            const std::wstring neg = mp.negative_sign ();
 
-            RW_ASSERT (dp == data->wdecimal_point_);
-            RW_ASSERT (ts == data->wthousands_sep_);
-            RW_ASSERT (fd == data->frac_digits_);
-            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
-            RW_ASSERT (!rw_strncmp (cur.c_str (), data->wcurr_symbol_));
-            RW_ASSERT (!rw_strncmp (pos.c_str (), data->wpositive_sign_));
-            RW_ASSERT (!rw_strncmp (neg.c_str (), data->wnegative_sign_));
+            pdata->wdecimal_point_ = dp;
+            pdata->wthousands_sep_ = ts;
 
-            RW_ASSERT (!std::memcmp (&pfm, data->pos_format_, 4));
-            RW_ASSERT (!std::memcmp (&nfm, data->neg_format_, 4));
+            typedef std::wstring::traits_type Traits;
+
+            Traits::copy (pdata->wcurr_symbol_,   cur.data (), cur.size ());
+            Traits::copy (pdata->wpositive_sign_, pos.data (), pos.size ());
+            Traits::copy (pdata->wnegative_sign_, neg.data (), neg.size ());
+        }
+        catch (...) {
+            rw_warn (0, 0, __LINE__,
+                     "std::locale(%#s) threw an exception, skipping", name);
+            continue;
         }
 
-        if (test_wchar) {
-            // exercise the wide char, international specialization
-
+        try {
             typedef std::moneypunct<wchar_t, true> Punct;
 
             const Punct &mp = std::use_facet<Punct>(loc);
 
-            const char           dp  = mp.decimal_point ();
-            const char           ts  = mp.thousands_sep ();
-            const std::string    grp = mp.grouping ();
-            const std::wstring   cur = mp.curr_symbol ();
-            const std::wstring   pos = mp.positive_sign ();
-            const std::wstring   neg = mp.negative_sign ();
-            const int            fd  = mp.frac_digits ();
-            const Punct::pattern pfm = mp.pos_format ();
-            const Punct::pattern nfm = mp.neg_format ();
+            const std::wstring cur = mp.curr_symbol ();
+            const std::wstring pos = mp.positive_sign ();
+            const std::wstring neg = mp.negative_sign ();
 
-            RW_ASSERT (dp == data->wdecimal_point_);
-            RW_ASSERT (ts == data->wthousands_sep_);
-            RW_ASSERT (fd == data->frac_digits_);
-            RW_ASSERT (!rw_strncmp (grp.c_str (), data->grouping_));
-            RW_ASSERT (!rw_strncmp (cur.c_str (), data->wint_curr_symbol_));
-            RW_ASSERT (!rw_strncmp (pos.c_str (), data->wpositive_sign_));
-            RW_ASSERT (!rw_strncmp (neg.c_str (), data->wnegative_sign_));
+            typedef std::wstring::traits_type Traits;
 
-            RW_ASSERT (!std::memcmp (&pfm, data->int_pos_format_, 4));
-            RW_ASSERT (!std::memcmp (&nfm, data->int_neg_format_, 4));
+            Traits::copy (pdata->wint_curr_symbol_, cur.data (), cur.size ());
+        }
+        catch (...) {
+            rw_warn (0, 0, __LINE__,
+                     "std::locale(%#s) threw an exception, skipping", name);
+            continue;
         }
 
 #endif   // _RWSTD_NO_WCHAR_T
 
-    }
-
-    return 0;
-}
-
-}   // extern "C"
-
-/**************************************************************************/
-
-static void
-get_format (MoneypunctData *pdata, const std::lconv *pconv)
-{
-    // code copied from src/punct.cpp
-
-    enum {
-        // for syntactic convenience
-        none   = std::money_base::none,
-        space  = std::money_base::space,
-        symbol = std::money_base::symbol,
-        sign   = std::money_base::sign,
-        value  = std::money_base::value
-    };
-
-    static const std::money_base::pattern pat[] = {
-
-        // cs_precedes [0..1]:
-        //
-        // An integer set to 1 if the currency_symbol precedes the value
-        // for a monetary value, and set to 0 if the symbol succeeds
-        // the value.
-
-        // sep_by_space [0..2]:
-        //
-        // 0  No space separates the currency_symbol from the value for
-        //    a monetary value.
-        // 1  If the currency symbol and sign string are adjacent, a space
-        //    separates them from the value; otherwise, a space separates
-        //    the currency symbol from the value.
-        // 2  If the currency symbol and sign string are adjacent, a space
-        //    separates them; otherwise, a space separates the sign string
-        //    from the value.
-
-        // sign_posn [0..4]:
-        //
-        // An integer set to a value indicating the positioning of the
-        // positive_sign for a monetary value. The following integer
-        // values shall be recognized:
-        //
-        // 0  Parentheses enclose the value and the currency_symbol.
-        // 1  The sign string precedes the value and the currency_symbol.
-        // 2  The sign string succeeds the value and the currency_symbol.
-        // 3  The sign string immediately precedes the currency_symbol.
-        // 4  The sign string immediately succeeds the currency_symbol.
-
-        // +-------- cs_precedes
-        // |+----- sep_by_space
-        // ||+-- sign_posn
-        // |||
-        // VVV  ....        -     1      $       .           // pattern
-        /* 000: -1$. */ { { sign, value, symbol, none } },   // "\3\4\2\0"
-        /* 001: -1$. */ { { sign, value, symbol, none } },   // "\3\4\2\0"
-        /* 002: 1$-. */ { { value, symbol, sign, none } },   // "\4\2\3\0"
-        /* 003: 1-$. */ { { value, sign, symbol, none } },   // "\4\3\2\0"
-        /* 004: 1$-. */ { { value, symbol, sign, none } },   // "\4\2\3\0"
-
-        /* 010: -1 $ */ { { sign, value, space, symbol } },  // "\3\4\1\2"
-        /* 011: -1 $ */ { { sign, value, space, symbol } },  // "\3\4\1\2"
-        /* 012: 1 $- */ { { value, space, symbol, sign } },  // "\4\1\2\3"
-        /* 013: 1 -$ */ { { value, space, sign, symbol } },  // "\4\3\3\2"
-        /* 014: 1 $- */ { { value, space, symbol, sign } },  // "\4\1\2\3"
-
-        /* 020: - 1$ */ { { sign, space, value, symbol } },  // "\3\1\4\2"
-        /* 021: - 1$ */ { { sign, space, value, symbol } },  // "\3\1\4\2"
-        /* 022: 1$ - */ { { value, symbol, space, sign } },  // "\4\2\1\3"
-        /* 023: 1- $ */ { { value, sign, space, symbol } },  // "\4\3\1\2"
-        /* 024: 1$ - */ { { value, symbol, space, sign } },  // "\4\2\1\3"
-
-        /* 100: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
-        /* 101: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
-        /* 102: $1-. */ { { symbol, value, sign, none } },   // "\2\4\3\0"
-        /* 103: -$1. */ { { sign, symbol, value, none } },   // "\3\2\4\0"
-        /* 104: $-1. */ { { symbol, sign, value, none } },   // "\2\3\4\0"
-
-        /* 110: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
-        /* 111: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
-        /* 112: $ 1- */ { { symbol, space, value, sign } },  // "\2\1\4\3"
-        /* 113: -$ 1 */ { { sign, symbol, space, value } },  // "\3\2\1\4"
-        /* 114: $- 1 */ { { symbol, sign, space, value } },  // "\2\3\1\4"
-
-        /* 120: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
-        /* 121: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
-        /* 122: $1 - */ { { symbol, value, space, sign } },  // "\2\4\1\3"
-        /* 123: - $1 */ { { sign, space, symbol, value } },  // "\3\1\2\4"
-        /* 124: $ -1 */ { { symbol, space, sign, value } }   // "\2\1\3\4"
-    };
-
-    std::size_t inx;
-
-    inx =   std::size_t (pconv->p_cs_precedes) * (3U * 5U)
-          + std::size_t (pconv->p_sep_by_space) * 5U
-          + std::size_t (pconv->p_sign_posn);
-
-    if (inx < sizeof pat / sizeof *pat)
-        std::memcpy (pdata->pos_format_, pat + inx, sizeof *pat);
-    else
-        std::memset (pdata->pos_format_, none, sizeof *pat);
-
-    inx =   std::size_t (pconv->n_cs_precedes) * (3U * 5U)
-          + std::size_t (pconv->n_sep_by_space) * 5U
-          + std::size_t (pconv->n_sign_posn);
-
-    if (inx < sizeof pat / sizeof *pat)
-        std::memcpy (pdata->neg_format_, pat + inx, sizeof *pat);
-    else
-        std::memset (pdata->neg_format_, none, sizeof *pat);
-
-
-#ifndef _RWSTD_NO_LCONV_INT_FMAT
-
-    inx =   std::size_t (pconv->int_p_cs_precedes) * (3U * 5U)
-          + std::size_t (pconv->int_p_sep_by_space) * 5U
-          + std::size_t (pconv->int_p_sign_posn);
-
-    if (inx < sizeof pat / sizeof *pat)
-        std::memcpy (pdata->int_pos_format_, pat + inx, sizeof *pat);
-    else
-        std::memset (pdata->int_pos_format_, none, sizeof *pat);
-
-    inx =   std::size_t (pconv->int_n_cs_precedes) * (3U * 5U)
-          + std::size_t (pconv->int_n_sep_by_space) * 5U
-          + std::size_t (pconv->int_n_sign_posn);
-
-    if (inx < sizeof pat / sizeof *pat)
-        memcpy (pdata->int_neg_format_, pat + inx, sizeof *pat);
-    else
-        memset (pdata->int_neg_format_, none, sizeof *pat);
-
-    std::strcpy (pdata->int_curr_symbol_, pconv->int_curr_symbol);
-
-    pdata->int_frac_digits_ = pconv->int_frac_digits;
-
-#else   // if defined (_RWSTD_NO_LCONV_INT_FMAT)
-
-    std::strcpy (pdata->int_curr_symbol_, pconv->curr_symbol);
-
-    pdata->int_frac_digits_ = pconv->frac_digits;
-
-#endif   // _RWSTD_NO_LCONV_INT_FMAT
-
-}
-
-
-static int
-run_test (int, char**)
-{
-    // get a NUL-separated list of names of installed locales
-    char* const locale_list = rw_locales ();
-
-    // array of locale names to use for testing
-    const char* locales [sizeof punct_data / sizeof *punct_data];
-
-    const std::size_t maxinx = sizeof locales / sizeof *locales;
-
-    // iterate over locales, initializing a global punct_data array
-    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
-
-        const std::size_t inx = nlocales;
-
-        // set LC_NUMERIC and LC_CTYPE to be able to use mbstowcs()
-        if (std::setlocale (LC_ALL, name)) {
-
-            const std::lconv* const pconv = std::localeconv ();
-            MoneypunctData* const pdata = punct_data + inx;
-
-            locales [inx] = pdata->locale_name_ = name;
-
-            // assign just the first character of the (potentially)
-            // multibyte decimal_point and thousands_sep (C++ locale
-            // can't deal with more)
-            pdata->decimal_point_ = *pconv->mon_decimal_point;
-            pdata->thousands_sep_ = *pconv->mon_thousands_sep;
-
-            pdata->frac_digits_   = pconv->frac_digits;
-
-            // simply copy the narrow grouping, currency symbols,
-            // and signs
-            std::strcpy (pdata->grouping_,      pconv->mon_grouping);
-            std::strcpy (pdata->curr_symbol_,   pconv->currency_symbol);
-            std::strcpy (pdata->negative_sign_, pconv->negative_sign);
-            std::strcpy (pdata->positive_sign_, pconv->positive_sign);
-            std::strcpy (pdata->grouping_,      pconv->mon_grouping);
-
-            get_format (pdata, pconv);
-
-#ifndef _RWSTD_WCHAR_T
-
-            wchar_t tmp [2];
-
-            // convert multibyte decimal point and thousands separator
-            // to wide characters (assumes they are single character
-            // each -- C++ locale can't handle more)
-            std::mbstowcs (tmp, pconv->mon_decimal_point, 2);
-            pdata->wdecimal_point_ = tmp [0];
-
-            std::mbstowcs (tmp, pconv->mon_thousands_sep, 2);
-            pdata->wthousands_sep_ = tmp [0];
-
-            const std::size_t n =
-                sizeof pdata->wcurr_symbol_ / sizeof (wchar_t);
-
-            std::mbstowcs (pdata->wcurr_symbol_,   pdata->curr_symbol_,   n);
-            std::mbstowcs (pdata->wnegative_sign_, pdata->negative_sign_, n);
-            std::mbstowcs (pdata->wpositive_sign_, pdata->positive_sign_, n);
-
-            std::mbstowcs (pdata->wint_curr_symbol_,
-                           pdata->int_curr_symbol_,
-                           n);
-
-#endif   // _RWSTD_WCHAR_T
-
-            ++nlocales;
-        }
+        ++nlocales;
 
         if (nlocales == maxinx)
             break;
     }
 
-    // reset the global locale
-    std::setlocale (LC_ALL, "C");
+    // unless the number of iterations was explicitly specified
+    // on the command line, decrease the number to equal the number
+    // of excericsed locales when only one thread is being tested
+    if (1 == rw_opt_nthreads && rw_opt_nloops < 0)
+        rw_opt_nloops = int (nlocales);
+
+    // when the number of iterations wasn't explicitly specified
+    // on the command line set it to the default value
+    if (rw_opt_nloops < 0)
+        rw_opt_nloops = DFLT_LOOPS;
+
+    rw_fatal (0 < nlocales, 0, __LINE__,
+              "must have at least one valid locale to test");
 
     rw_info (0, 0, 0,
              "testing std::moneypunct<charT> with %d thread%{?}s%{;}, "
-             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
              rw_opt_nthreads, 1 != rw_opt_nthreads,
              rw_opt_nloops, 1 != rw_opt_nloops,
-             int (nlocales), "%#s", locales);
+             nlocales, int (nlocales), "%#s", locales);
 
     rw_info (0, 0, 0, "exercising std::moneypunct<char>");
 
@@ -531,12 +462,24 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
     return rw_test (argc, argv, __FILE__,
                     "lib.locale.moneypunct",
                     "thread safety", run_test,
                     "|-nloops#0 "       // must be non-negative
-                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    "|-nthreads#0-* "   // must be in [0, MAX_THREADS]
+                    "|-locales=",       // must be provided
                     &rw_opt_nloops,
                     int (MAX_THREADS),
-                    &rw_opt_nthreads);
+                    &rw_opt_nthreads,
+                    &rw_opt_setlocales);
 }
diff --git a/tests/localization/22.locale.num.get.mt.cpp b/tests/localization/22.locale.num.get.mt.cpp
new file mode 100644
index 0000000..02f979a
--- /dev/null
+++ b/tests/localization/22.locale.num.get.mt.cpp
@@ -0,0 +1,560 @@
+/************************************************************************
+ *
+ * 22.locale.num.get.mt.cpp
+ *
+ * test exercising the thread safety of the num_get facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <ios>        // for ios
+#include <iterator>   // for ostreambuf_iterator
+#include <locale>     // for locale, num_get
+
+#include <cstring>    // for strlen()
+
+#include <rw_locale.h>
+#include <rw_thread.h>   // for rw_get_processors (), rw_thread_pool()
+#include <driver.h>
+#include <valcmp.h>
+
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int rw_opt_nthreads = 1;
+
+// the number of times each thread should iterate
+int rw_opt_nloops = MAX_LOOPS;
+
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+
+struct MyNumData {
+
+    enum { BufferSize = 32 };
+
+    enum PutId {
+        put_bool,
+        put_long,
+        put_ulong,
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+        put_llong,
+        put_ullong,
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+        put_dbl,
+
+#ifndef _RWSTD_NO_LONG_DOUBLE
+
+        put_ldbl,
+
+#endif   // _RWSTD_NO_LONG_DOUBLE
+
+        put_ptr,
+        put_max
+    };
+
+    // name of the locale the data corresponds to
+    const char* locale_name_;
+
+    // optionally set to the named locale for threads to share
+    std::locale locale_;
+
+    // the value that we will be formatting
+    double value_;
+
+    // the type of the data we get
+    PutId type_;
+
+    // holds the narrow/wide character representation of value_ and
+    // the number of used 'charT' in each buffer.
+    char    ncs_ [BufferSize];
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    wchar_t wcs_ [BufferSize];
+
+#endif  // _RWSTD_NO_WCHAR_T
+
+} my_num_data [MAX_THREADS];
+
+/**************************************************************************/
+
+template <class charT, class Traits>
+struct MyIos: std::basic_ios<charT, Traits>
+{
+   MyIos () {
+        this->init (0);
+    }
+};
+
+template <class charT, class Traits>
+struct MyStreambuf: std::basic_streambuf<charT, Traits>
+{
+    typedef std::basic_streambuf<charT, Traits> Base;
+
+    MyStreambuf ()
+        : Base () {
+    }
+
+    void pubsetg (const charT *gbeg, std::streamsize n) {
+        this->setg (_RWSTD_CONST_CAST (charT*, gbeg),
+                    _RWSTD_CONST_CAST (charT*, gbeg),
+                    _RWSTD_CONST_CAST (charT*, gbeg) + n);
+    }
+
+    void pubsetp (charT *pbeg, std::streamsize n) {
+        this->setp (pbeg, pbeg + n);
+    }
+};
+
+template <class charT, class Traits>
+void
+test_put_data (const MyNumData                               &data,
+               const std::num_put<charT>                     &np,
+               const std::ostreambuf_iterator<charT, Traits> &iter,
+               std::basic_ios<charT, Traits>                 &io,
+               charT                                          fill,
+               charT                                          term)
+{
+    switch (data.type_) {
+    case MyNumData::put_bool:
+        *np.put (iter, io, fill,
+                 data.value_ < 1.f) = term;
+        break;
+    case MyNumData::put_long:
+        *np.put (iter, io, fill,
+                 (long)data.value_) = term;
+        break;
+    case MyNumData::put_ulong:
+        *np.put (iter, io, fill,
+                 (unsigned long)data.value_) = term;
+        break;
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+    case MyNumData::put_llong:
+        *np.put (iter, io, fill,
+                 (_RWSTD_LONG_LONG)data.value_) = term;
+        break;
+    case MyNumData::put_ullong:
+        *np.put (iter, io, fill,
+                 (unsigned _RWSTD_LONG_LONG)data.value_) = term;
+        break;
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+    case MyNumData::put_dbl:
+        *np.put (iter, io, fill,
+                 (double)data.value_) = term;
+
+        break;
+
+#ifndef _RWSTD_NO_LONG_DOUBLE
+
+    case MyNumData::put_ldbl:
+        *np.put (iter, io, fill,
+                 (long double)data.value_) = term;
+        break;
+
+#endif   // _RWSTD_NO_LONG_DOUBLE
+
+    case MyNumData::put_ptr:
+        *np.put (iter, io, fill,
+                 (const void*)&data.value_) = term;
+        break;
+
+    case MyNumData::put_max:
+        // avoid enumeration value `put_max' not handled in switch
+        // this case should never happen
+        break;
+    }
+}
+
+
+template <class charT, class Traits>
+void
+test_get_data (const MyNumData                               &data,
+               const std::num_get<charT>                     &np,
+               const std::istreambuf_iterator<charT, Traits> &iter,
+               const std::istreambuf_iterator<charT, Traits> &end,
+               std::basic_ios<charT, Traits>                 &io)
+{
+    std::ios_base::iostate state = std::ios_base::goodbit;
+
+    switch (data.type_) {
+    case MyNumData::put_bool: {
+            const bool expected = data.value_ < 1.f;
+                  bool checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+    case MyNumData::put_long: {
+            const long expected = (long)data.value_;
+                  long checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+    case MyNumData::put_ulong: {
+            const unsigned long expected = (unsigned long)data.value_;
+                  unsigned long checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+    case MyNumData::put_llong: {
+            const _RWSTD_LONG_LONG expected = (_RWSTD_LONG_LONG)data.value_;
+                  _RWSTD_LONG_LONG checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+    case MyNumData::put_ullong: {
+            const unsigned _RWSTD_LONG_LONG expected
+                = (unsigned _RWSTD_LONG_LONG)data.value_;
+                  unsigned _RWSTD_LONG_LONG checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+    case MyNumData::put_dbl: {
+            const double expected = (double)data.value_;
+                  double checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+
+#ifndef _RWSTD_NO_LONG_DOUBLE
+
+    case MyNumData::put_ldbl: {
+            const long double expected = (long double)data.value_;
+                  long double checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+
+#endif   // _RWSTD_NO_LONG_DOUBLE
+
+    case MyNumData::put_ptr: {
+            const void* expected = (const void*)&data.value_;
+                  void* checked;
+            np.get (iter, end, io, state, checked);
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT (checked == expected);
+        }
+        break;
+
+    case MyNumData::put_max:
+        // avoid enumeration value `put_max' not handled in switch
+        // this case should never happen
+        break;
+    }
+}
+
+extern "C" {
+
+bool test_char;    // exercise num_get<char>
+bool test_wchar;   // exercise num_get<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
+
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
+
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        // fill in the value and results for this locale
+        const MyNumData& data = my_num_data [i % nlocales];
+
+        // construct a named locale and imbue it in the ios object
+        // so that the locale is used not only by the num_put facet
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::num_get<char> &np =
+                std::use_facet<std::num_get<char> >(loc);
+
+            nio.imbue (loc);
+            nsb.pubsetg (data.ncs_, RW_COUNT_OF (data.ncs_));
+
+            test_get_data (data, np,
+                           std::istreambuf_iterator<char>(&nsb),
+                           std::istreambuf_iterator<char>(),
+                           nio);
+
+            RW_ASSERT (!nio.fail ()); 
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::num_get<wchar_t> &wp =
+                std::use_facet<std::num_get<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetg (data.wcs_, RW_COUNT_OF (data.wcs_));
+
+            test_get_data (data, wp,
+                           std::istreambuf_iterator<wchar_t>(&wsb),
+                           std::istreambuf_iterator<wchar_t>(),
+                           wio);
+
+            RW_ASSERT (!wio.fail ()); 
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+
+static int
+run_test (int, char**)
+{
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
+
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
+
+    // find all installed locales for which setlocale(LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    const std::size_t maxinx = RW_COUNT_OF (locales);
+
+    for (const char *name = locale_list;
+         *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+        locales [inx] = name;
+
+        // fill in the value and results for this locale
+        MyNumData& data = my_num_data [nlocales];
+        data.locale_name_ = name;
+
+        try {
+            const std::locale loc (data.locale_name_);
+
+            data.value_ = nlocales & 1 ? -1.f * nlocales : 1.f * nlocales;
+            data.type_ = MyNumData::PutId (nlocales % MyNumData::put_max);
+
+            // format data into buffers
+            const std::num_put<char> &np =
+                std::use_facet<std::num_put<char> >(loc);
+
+            nio.imbue (loc);
+            nsb.pubsetp (data.ncs_, RW_COUNT_OF (data.ncs_));
+
+            test_put_data (data, np, std::ostreambuf_iterator<char>(&nsb),
+                           nio, ' ', '\0');
+
+            rw_fatal (!nio.fail (), __FILE__, __LINE__,
+                      "num_put<char>::put(...) failed for locale(%#s)",
+                      data.locale_name_);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::num_put<wchar_t> &wp =
+                std::use_facet<std::num_put<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetp (data.wcs_, RW_COUNT_OF (data.wcs_));
+
+            test_put_data (data, wp, std::ostreambuf_iterator<wchar_t>(&wsb),
+                           wio, L' ', L'\0');
+
+            rw_fatal (!wio.fail (), __FILE__, __LINE__,
+                      "num_put<wchar_t>::put(...) failed for locale(%#s)",
+                      data.locale_name_);
+
+#endif // _RWSTD_NO_WCHAR_T
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
+            break;
+    }
+
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
+    rw_info (0, 0, 0,
+             "testing std::num_get<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             nlocales, int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::num_get<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::num_get<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise both the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::num_get<char> and std::num_get<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv [])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.num.get",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-* "   // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "     // arg must be non-negative
+                    "|-locales= "       // must be provided
+                    "|-shared-locale# ",
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
+}
diff --git a/tests/localization/22.locale.num.put.cpp b/tests/localization/22.locale.num.put.cpp
index 24003ad..f3088db 100644
--- a/tests/localization/22.locale.num.put.cpp
+++ b/tests/localization/22.locale.num.put.cpp
@@ -1428,6 +1428,286 @@
 #endif   // _RWSTD_NO_LONG_LONG
 }
 
+/**************************************************************************/
+
+// use a volatile variable to fool optimizers into not issuing
+// warnings about division by zero
+volatile double zero;
+
+
+template <class charT, class floatT>
+void inf_nan_test (charT, floatT, const char *cname, const char *tname)
+{
+    rw_info (0, 0, 0, "std::num_put<%s>::put (..., %s) formatting "
+             "infinities", cname, tname);
+
+    // compute infinity
+    const floatT inf = 1 / zero;
+
+    //////////////////////////////////////////////////////////////////
+    // exercise the formatting of positive and negative infinities
+
+    //        +-- value to format
+    //        |    +-- fmtflags
+    //        |    |                    +-- precision
+    //        |    |                    |  +-- field width
+    //        |    |                    |  |   +-- fill character
+    //        |    |                    |  |   |   +-- grouping
+    //        |    |                    |  |   |   |   +-- expected output
+    //        |    |                    |  |   |   |   |
+    //        V    V                    V  V   V   V   V
+    TEST (T,  inf, 0,                   0, 0, ' ', "", "inf");
+    TEST (T,  inf, showpos,             0, 0, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           0, 0, ' ', "", "INF");
+    TEST (T,  inf, showpos | uppercase, 0, 0, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   0, 0, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             0, 0, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           0, 0, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 0, 0, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   1, 0, ' ', "", "inf");
+    TEST (T,  inf, showpos,             1, 0, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           1, 0, ' ', "", "INF");
+    TEST (T,  inf, showpos | uppercase, 1, 0, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   1, 0, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             1, 0, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           1, 0, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 1, 0, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   3, 0, ' ', "", "inf");
+    TEST (T,  inf, showpos,             3, 0, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           3, 0, ' ', "", "INF");
+    TEST (T,  inf, showpos | uppercase, 3, 0, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   3, 0, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             3, 0, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           3, 0, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 3, 0, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   4, 0, ' ', "", "inf");
+    TEST (T,  inf, showpos,             4, 0, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           4, 0, ' ', "", "INF");
+    TEST (T,  inf, showpos | uppercase, 4, 0, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   4, 0, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             4, 0, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           4, 0, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 4, 0, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   9, 0, ' ', "", "inf");
+    TEST (T,  inf, showpos,             9, 0, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           9, 0, ' ', "", "INF");
+    TEST (T,  inf, showpos | uppercase, 9, 0, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   9, 0, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             9, 0, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           9, 0, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 9, 0, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   0, 1, ' ', "", "inf");
+    TEST (T,  inf, showpos,             0, 1, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           0, 1, ' ', "", "INF");
+    TEST (T,  inf, showpos | uppercase, 0, 1, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   0, 1, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             0, 1, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           0, 1, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 0, 1, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   0, 3, ' ', "", "inf");
+    TEST (T,  inf, showpos,             0, 3, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           0, 3, ' ', "", "INF");
+    TEST (T,  inf, showpos | uppercase, 0, 3, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   0, 3, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             0, 3, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           0, 3, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 0, 3, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   0, 4, ' ', "", " inf");
+    TEST (T,  inf, showpos,             0, 4, ' ', "", "+inf");
+    TEST (T,  inf, uppercase,           0, 4, ' ', "", " INF");
+    TEST (T,  inf, showpos | uppercase, 0, 4, ' ', "", "+INF");
+
+    TEST (T, -inf, 0,                   0, 4, ' ', "", "-inf");
+    TEST (T, -inf, showpos,             0, 4, ' ', "", "-inf");
+    TEST (T, -inf, uppercase,           0, 4, ' ', "", "-INF");
+    TEST (T, -inf, showpos | uppercase, 0, 4, ' ', "", "-INF");
+
+    TEST (T,  inf, 0,                   0, 8, ' ', "", "     inf");
+    TEST (T,  inf, showpos,             0, 8, ' ', "", "    +inf");
+    TEST (T,  inf, uppercase,           0, 8, ' ', "", "     INF");
+    TEST (T,  inf, showpos | uppercase, 0, 8, ' ', "", "    +INF");
+
+    TEST (T, -inf, 0,                   0, 8, ' ', "", "    -inf");
+    TEST (T, -inf, showpos,             0, 8, ' ', "", "    -inf");
+    TEST (T, -inf, uppercase,           0, 8, ' ', "", "    -INF");
+    TEST (T, -inf, showpos | uppercase, 0, 8, ' ', "", "    -INF");
+
+    TEST (T,  inf, left,                        0, 9, ' ', "", "inf      ");
+    TEST (T,  inf, left | showpos,              0, 9, ' ', "", "+inf     ");
+    TEST (T,  inf, left | uppercase,            0, 9, ' ', "", "INF      ");
+    TEST (T,  inf, left | showpos | uppercase,  0, 9, ' ', "", "+INF     ");
+
+    TEST (T, -inf, left,                        0, 9, ' ', "", "-inf     ");
+    TEST (T, -inf, left | showpos,              0, 9, ' ', "", "-inf     ");
+    TEST (T, -inf, left | uppercase,            0, 9, ' ', "", "-INF     ");
+    TEST (T, -inf, left | showpos | uppercase,  0, 9, ' ', "", "-INF     ");
+
+    TEST (T,  inf, right,                       0, 9, ' ', "", "      inf");
+    TEST (T,  inf, right | showpos,             0, 9, ' ', "", "     +inf");
+    TEST (T,  inf, right | uppercase,           0, 9, ' ', "", "      INF");
+    TEST (T,  inf, right | showpos | uppercase, 0, 9, ' ', "", "     +INF");
+
+    TEST (T, -inf, right,                       0, 9, ' ', "", "     -inf");
+    TEST (T, -inf, right | showpos,             0, 9, ' ', "", "     -inf");
+    TEST (T, -inf, right | uppercase,           0, 9, ' ', "", "     -INF");
+    TEST (T, -inf, right | showpos | uppercase, 0, 9, ' ', "", "     -INF");
+
+    //////////////////////////////////////////////////////////////////
+    // exercise the formatting of positive and negative (quiet) NaNs
+
+    rw_info (0, 0, 0, "std::num_put<%s>::put (..., %s) formatting "
+             "NaN's", cname, tname);
+
+    // compute a quiet NaN
+#if 0
+
+    // temporarily disabled (NAN format is platform specific
+    // and subject to bugs -- see for example STDCXX-460)
+
+    const floatT nan = 0 / zero;
+
+    TEST (T,  nan, 0,                   0, 0, ' ', "", "nan");
+    TEST (T,  nan, showpos,             0, 0, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           0, 0, ' ', "", "NAN");
+    TEST (T,  nan, showpos | uppercase, 0, 0, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   0, 0, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             0, 0, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           0, 0, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 0, 0, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   1, 0, ' ', "", "nan");
+    TEST (T,  nan, showpos,             1, 0, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           1, 0, ' ', "", "NAN");
+    TEST (T,  nan, showpos | uppercase, 1, 0, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   1, 0, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             1, 0, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           1, 0, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 1, 0, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   3, 0, ' ', "", "nan");
+    TEST (T,  nan, showpos,             3, 0, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           3, 0, ' ', "", "NAN");
+    TEST (T,  nan, showpos | uppercase, 3, 0, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   3, 0, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             3, 0, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           3, 0, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 3, 0, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   4, 0, ' ', "", "nan");
+    TEST (T,  nan, showpos,             4, 0, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           4, 0, ' ', "", "NAN");
+    TEST (T,  nan, showpos | uppercase, 4, 0, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   4, 0, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             4, 0, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           4, 0, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 4, 0, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   9, 0, ' ', "", "nan");
+    TEST (T,  nan, showpos,             9, 0, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           9, 0, ' ', "", "NAN");
+    TEST (T,  nan, showpos | uppercase, 9, 0, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   9, 0, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             9, 0, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           9, 0, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 9, 0, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   0, 1, ' ', "", "nan");
+    TEST (T,  nan, showpos,             0, 1, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           0, 1, ' ', "", "NAN");
+    TEST (T,  nan, showpos | uppercase, 0, 1, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   0, 1, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             0, 1, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           0, 1, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 0, 1, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   0, 3, ' ', "", "nan");
+    TEST (T,  nan, showpos,             0, 3, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           0, 3, ' ', "", "NAN");
+    TEST (T,  nan, showpos | uppercase, 0, 3, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   0, 3, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             0, 3, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           0, 3, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 0, 3, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   0, 4, ' ', "", " nan");
+    TEST (T,  nan, showpos,             0, 4, ' ', "", "+nan");
+    TEST (T,  nan, uppercase,           0, 4, ' ', "", " NAN");
+    TEST (T,  nan, showpos | uppercase, 0, 4, ' ', "", "+NAN");
+
+    TEST (T, -nan, 0,                   0, 4, ' ', "", "-nan");
+    TEST (T, -nan, showpos,             0, 4, ' ', "", "-nan");
+    TEST (T, -nan, uppercase,           0, 4, ' ', "", "-NAN");
+    TEST (T, -nan, showpos | uppercase, 0, 4, ' ', "", "-NAN");
+
+    TEST (T,  nan, 0,                   0, 5, ' ', "", "  nan");
+    TEST (T,  nan, showpos,             0, 5, ' ', "", " +nan");
+    TEST (T,  nan, uppercase,           0, 5, ' ', "", "  NAN");
+    TEST (T,  nan, showpos | uppercase, 0, 5, ' ', "", " +NAN");
+
+    TEST (T, -nan, 0,                   0, 5, ' ', "", " -nan");
+    TEST (T, -nan, showpos,             0, 5, ' ', "", " -nan");
+    TEST (T, -nan, uppercase,           0, 5, ' ', "", " -NAN");
+    TEST (T, -nan, showpos | uppercase, 0, 5, ' ', "", " -NAN");
+
+    TEST (T,  nan, 0,                   0, 8, ' ', "", "     nan");
+    TEST (T,  nan, showpos,             0, 8, ' ', "", "    +nan");
+    TEST (T,  nan, uppercase,           0, 8, ' ', "", "     NAN");
+    TEST (T,  nan, showpos | uppercase, 0, 8, ' ', "", "    +NAN");
+
+    TEST (T, -nan, 0,                   0, 8, ' ', "", "    -nan");
+    TEST (T, -nan, showpos,             0, 8, ' ', "", "    -nan");
+    TEST (T, -nan, uppercase,           0, 8, ' ', "", "    -NAN");
+    TEST (T, -nan, showpos | uppercase, 0, 8, ' ', "", "    -NAN");
+
+    TEST (T,  nan, left,                        0, 9, ' ', "", "nan      ");
+    TEST (T,  nan, left | showpos,              0, 9, ' ', "", "+nan     ");
+    TEST (T,  nan, left | uppercase,            0, 9, ' ', "", "NAN      ");
+    TEST (T,  nan, left | showpos | uppercase,  0, 9, ' ', "", "+NAN     ");
+
+    TEST (T, -nan, left,                        0, 9, ' ', "", "-nan     ");
+    TEST (T, -nan, left | showpos,              0, 9, ' ', "", "-nan     ");
+    TEST (T, -nan, left | uppercase,            0, 9, ' ', "", "-NAN     ");
+    TEST (T, -nan, left | showpos | uppercase,  0, 9, ' ', "", "-NAN     ");
+
+    TEST (T,  nan, right,                       0, 9, ' ', "", "      nan");
+    TEST (T,  nan, right | showpos,             0, 9, ' ', "", "     +nan");
+    TEST (T,  nan, right | uppercase,           0, 9, ' ', "", "      NAN");
+    TEST (T,  nan, right | showpos | uppercase, 0, 9, ' ', "", "     +NAN");
+
+    TEST (T, -nan, right,                       0, 9, ' ', "", "     -nan");
+    TEST (T, -nan, right | showpos,             0, 9, ' ', "", "     -nan");
+    TEST (T, -nan, right | uppercase,           0, 9, ' ', "", "     -NAN");
+    TEST (T, -nan, right | showpos | uppercase, 0, 9, ' ', "", "     -NAN");
+
+#else
+
+    rw_info (0, 0, 0, "std::num_put<%s>::put (..., %s) formatting "
+             "NaN's disabled due to platform bugs", cname, tname);
+
+#endif   // 0/1
+
+}
 
 /**************************************************************************/
 
@@ -1511,8 +1791,9 @@
         // reset the global locale
         std::setlocale (LC_NUMERIC, "C");
     }
-}
 
+    inf_nan_test (charT (), double (), cname, tname);
+}
 
 /**************************************************************************/
 
@@ -1681,6 +1962,8 @@
     TEST (T, Pi, scientific, -3, 0, ' ', "", "%Le");
     TEST (T, Pi, scientific, -7, 0, ' ', "", "%Le");
 
+    inf_nan_test (charT (), (long double)0, cname, tname);
+
 #endif   // _RWSTD_NO_LONG_DOUBLE
 }
 
diff --git a/tests/localization/22.locale.num.put.mt.cpp b/tests/localization/22.locale.num.put.mt.cpp
index bb567b9..4358854 100644
--- a/tests/localization/22.locale.num.put.mt.cpp
+++ b/tests/localization/22.locale.num.put.mt.cpp
@@ -33,24 +33,26 @@
 #include <cstring>    // for strlen()
 
 #include <rw_locale.h>
-#include <rw_thread.h>
+#include <rw_thread.h>   // for rw_get_processors (), rw_thread_pool()
 #include <driver.h>
+#include <valcmp.h>
 
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
 
-// maximum number of threads allowed by the command line interface
-#define MAX_THREADS   32
-
-
-#ifdef _RWSTD_REENTRANT
-int rw_opt_nthreads = 4;
-#else   // if !defined (_RWSTD_REENTRANT)
-// in non-threaded builds use just one thread
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
 int rw_opt_nthreads = 1;
-#endif   // _RWSTD_REENTRANT
 
-// the number of times each thread should iterate (unless specified
-// otherwise on the command line)
-int rw_opt_nloops = 200000;
+// the number of times each thread should iterate
+int rw_opt_nloops = MAX_LOOPS;
+
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
 
 /**************************************************************************/
 
@@ -62,8 +64,147 @@
 static std::size_t
 nlocales;
 
+
+struct MyNumData {
+
+    enum { BufferSize = 32 };
+
+    enum PutId {
+        put_bool,
+        put_long,
+        put_ulong,
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+        put_llong,
+        put_ullong,
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+        put_dbl,
+
+#ifndef _RWSTD_NO_LONG_DOUBLE
+
+        put_ldbl,
+
+#endif   // _RWSTD_NO_LONG_DOUBLE
+
+        put_ptr,
+        put_max
+    };
+
+    // name of the locale the data corresponds to
+    const char* locale_name_;
+
+    // optionally set to the named locale for threads to share
+    std::locale locale_;
+
+    // the value that we will be formatting
+    double value_;
+
+    // the type of the data we put
+    PutId type_;
+
+    // holds the narrow/wide character representation of value_ and
+    // the number of used 'charT' in each buffer.
+    char    ncs_ [BufferSize];
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    wchar_t wcs_ [BufferSize];
+
+#endif  // _RWSTD_NO_WCHAR_T
+
+} my_num_data [MAX_THREADS];
+
 /**************************************************************************/
 
+template <class charT, class Traits>
+struct MyIos: std::basic_ios<charT, Traits>
+{
+   MyIos () {
+        this->init (0);
+    }
+};
+
+template <class charT, class Traits>
+struct MyStreambuf: std::basic_streambuf<charT, Traits>
+{
+    typedef std::basic_streambuf<charT, Traits> Base;
+
+    MyStreambuf ()
+        : Base () {
+    }
+
+    void pubsetp (charT *pbeg, std::streamsize n) {
+        this->setp (pbeg, pbeg + n);
+    }
+};
+
+template <class charT, class Traits>
+void
+put_data (const MyNumData                               &data,
+          const std::num_put<charT>                     &np,
+          const std::ostreambuf_iterator<charT, Traits> &iter,
+          std::basic_ios<charT, Traits>                 &io,
+          charT                                          fill,
+          charT                                          term)
+{
+    switch (data.type_) {
+    case MyNumData::put_bool:
+        *np.put (iter, io, fill,
+                 data.value_ < 1.f) = term;
+        break;
+    case MyNumData::put_long:
+        *np.put (iter, io, fill,
+                 (long)data.value_) = term;
+        break;
+    case MyNumData::put_ulong:
+        *np.put (iter, io, fill,
+                 (unsigned long)data.value_) = term;
+        break;
+
+#ifndef _RWSTD_NO_LONG_LONG
+
+    case MyNumData::put_llong:
+        *np.put (iter, io, fill,
+                 (_RWSTD_LONG_LONG)data.value_) = term;
+        break;
+    case MyNumData::put_ullong:
+        *np.put (iter, io, fill,
+                 (unsigned _RWSTD_LONG_LONG)data.value_) = term;
+        break;
+
+#endif   // _RWSTD_NO_LONG_LONG
+
+    case MyNumData::put_dbl:
+        *np.put (iter, io, fill,
+                 (double)data.value_) = term;
+
+        break;
+
+#ifndef _RWSTD_NO_LONG_DOUBLE
+
+    case MyNumData::put_ldbl:
+        *np.put (iter, io, fill,
+                 (long double)data.value_) = term;
+        break;
+
+#endif   // _RWSTD_NO_LONG_DOUBLE
+
+    case MyNumData::put_ptr:
+        *np.put (iter, io, fill,
+                 (const void*)&data.value_) = term;
+        break;
+
+    case MyNumData::put_max:
+        // avoid enumeration value `put_max' not handled in switch
+        // this case should never happen
+        break;
+    }
+
+}
+
 extern "C" {
 
 bool test_char;    // exercise num_put<char>
@@ -73,88 +214,28 @@
 static void*
 thread_func (void*)
 {
-    // dummy streambuf-derived object the doesn't do anything
-    // but allows ostreambuf_iterator to "think" it can write
-    // to it
-    struct NarrowBuf: std::streambuf {
-        int_type overflow (int_type c) { return c; }
-    } sb;
+    char               ncs [MyNumData::BufferSize];
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
 
 #ifndef _RWSTD_NO_WCHAR_T
-
-    struct WideBuf: std::wstreambuf {
-        int_type overflow (int_type c) { return c; }
-    } wb;
-
-#endif   // _RWSTD_NO_WCHAR_T
-
-    struct Ios: std::ios {
-        Ios () { this->init (0); }
-    } io;
-
-    const std::ios::fmtflags baseflags[] = {
-        std::ios::oct,
-        std::ios::dec,
-        std::ios::hex
-    };
-
-    const std::ios::fmtflags fmtflags[] = {
-        std::ios::showpos,
-        std::ios::showpoint,
-        std::ios::fixed,
-        std::ios::scientific
-    };
-
-    const std::ios::fmtflags adjustflags[] = {
-        std::ios::internal,
-        std::ios::left,
-        std::ios::right
-    };
+    wchar_t                  wcs [MyNumData::BufferSize];
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
 
     for (int i = 0; i != rw_opt_nloops; ++i) {
 
-        // save the name of the locale
-        const char* const locale_name = locales [i % nlocales];
+        // fill in the value and results for this locale
+        const MyNumData& data = my_num_data [i % nlocales];
 
         // construct a named locale and imbue it in the ios object
         // so that the locale is used not only by the num_put facet
-        // but also by the numpunct facet
-        const std::locale loc (locale_name);
-        io.imbue (loc);
-
-        enum PutId {
-            put_bool,
-            put_long,
-            put_ulong,
-
-#ifndef _RWSTD_NO_LONG_LONG
-
-            put_llong,
-            put_ullong,
-
-#endif   // _RWSTD_NO_LONG_LONG
-
-            put_dbl,
-            put_ldbl,
-            put_ptr,
-            put_max
-        };
-
-        const std::ios::fmtflags base =
-            baseflags [i % (sizeof baseflags / sizeof *baseflags)];
-
-        const std::ios::fmtflags fmt =
-            fmtflags [i % (sizeof baseflags / sizeof *baseflags)];
-
-        const std::ios::fmtflags adjust =
-            adjustflags [i % (sizeof baseflags / sizeof *baseflags)];
-
-        io.flags (base | fmt | adjust);
-
-        io.width (i % 16);
-
-        // exercise postive and negative values
-        const int ival = i & 1 ? -i : i;
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
 
         if (test_char) {
             // exercise the narrow char specialization of the facet
@@ -162,50 +243,14 @@
             const std::num_put<char> &np =
                 std::use_facet<std::num_put<char> >(loc);
 
-            const std::ostreambuf_iterator<char> iter (&sb);
+            nio.imbue (loc);
+            nsb.pubsetp (ncs, RW_COUNT_OF (ncs));
 
-            switch (PutId (i % put_max)) {
-            case put_bool:
-                if (i & 2)
-                    io.setf (std::ios::boolalpha);
-                else
-                    io.unsetf (std::ios::boolalpha);
-                        
-                np.put (iter, io, ' ', bool (ival));
-                break;
+            put_data (data, np, std::ostreambuf_iterator<char>(&nsb),
+                      nio, ' ', '\0');
 
-            case put_long:
-                np.put (iter, io, ' ', long (ival));
-                break;
-
-            case put_ulong:
-                np.put (iter, io, ' ', (unsigned long)ival);
-                break;
-
-#ifndef _RWSTD_NO_LONG_LONG
-
-            case put_llong:
-                np.put (iter, io, ' ', (_RWSTD_LONG_LONG)ival);
-                break;
-
-#endif   // _RWSTD_NO_LONG_LONG
-
-            case put_ullong:
-                np.put (iter, io, ' ', (unsigned _RWSTD_LONG_LONG)ival);
-                break;
-
-            case put_dbl:
-                np.put (iter, io, ' ', double (ival));
-                break;
-
-            case put_ldbl:
-                np.put (iter, io, ' ', (long double)ival);
-                break;
-
-            case put_ptr:
-                np.put (iter, io, ' ', (void*)ival);
-                break;
-            }
+            RW_ASSERT (!nio.fail ()); 
+            RW_ASSERT (!rw_strncmp (ncs, data.ncs_));
         }
 
         // both specializations may be tested at the same time
@@ -215,48 +260,17 @@
 
 #ifndef _RWSTD_NO_WCHAR_T
 
-            const std::num_put<wchar_t> &np =
+            const std::num_put<wchar_t> &wp =
                 std::use_facet<std::num_put<wchar_t> >(loc);
 
-            const std::ostreambuf_iterator<wchar_t> iter (&wb);
+            wio.imbue (loc);
+            wsb.pubsetp (wcs, RW_COUNT_OF (wcs));
 
-            switch (PutId (i % put_max)) {
-            case put_bool:
-                np.put (iter, io, L' ', bool (ival));
-                break;
+            put_data (data, wp, std::ostreambuf_iterator<wchar_t>(&wsb),
+                      wio, L' ', L'\0');
 
-            case put_long:
-                np.put (iter, io, L' ', long (ival));
-                break;
-
-            case put_ulong:
-                np.put (iter, io, L' ', (unsigned long)ival);
-                break;
-
-#ifndef _RWSTD_NO_LONG_LONG
-
-            case put_llong:
-                np.put (iter, io, L' ', (_RWSTD_LONG_LONG)ival);
-                break;
-
-            case put_ullong:
-                np.put (iter, io, L' ', (unsigned _RWSTD_LONG_LONG)ival);
-                break;
-
-#endif   // _RWSTD_NO_LONG_LONG
-
-            case put_dbl:
-                np.put (iter, io, L' ', double (ival));
-                break;
-
-            case put_ldbl:
-                np.put (iter, io, L' ', (long double)ival);
-                break;
-
-            case put_ptr:
-                np.put (iter, io, L' ', (void*)ival);
-                break;
-            }
+            RW_ASSERT (!wio.fail ()); 
+            RW_ASSERT (!rw_strncmp (wcs, data.wcs_));
 
 #endif   // _RWSTD_NO_WCHAR_T
 
@@ -270,26 +284,98 @@
 
 /**************************************************************************/
 
+
 static int
 run_test (int, char**)
 {
-    char* const locale_list = rw_locales ();
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
 
-    const std::size_t maxinx = sizeof locales / sizeof *locales;
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
 
-    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
-        locales [nlocales++] = name;
+    // find all installed locales for which setlocale(LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
 
-        if (nlocales == maxinx)
+    const std::size_t maxinx = RW_COUNT_OF (locales);
+
+    for (const char *name = locale_list;
+         *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+        locales [inx] = name;
+
+        // fill in the value and results for this locale
+        MyNumData& data = my_num_data [nlocales];
+        data.locale_name_ = name;
+
+        try {
+            const std::locale loc (data.locale_name_);
+
+            data.value_ = nlocales & 1 ? -1 * nlocales : nlocales;
+            data.type_ = MyNumData::PutId (nlocales % MyNumData::put_max);
+
+            // format data into buffers
+            const std::num_put<char> &np =
+                std::use_facet<std::num_put<char> >(loc);
+
+            nio.imbue (loc);
+            nsb.pubsetp (data.ncs_, RW_COUNT_OF (data.ncs_));
+
+            put_data (data, np, std::ostreambuf_iterator<char>(&nsb),
+                      nio, ' ', '\0');
+
+            rw_fatal (!nio.fail (), __FILE__, __LINE__,
+                      "num_put<char>::put(...) failed for locale(%#s)",
+                      data.locale_name_);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::num_put<wchar_t> &wp =
+                std::use_facet<std::num_put<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetp (data.wcs_, RW_COUNT_OF (data.wcs_));
+
+            put_data (data, wp, std::ostreambuf_iterator<wchar_t>(&wsb),
+                      wio, L' ', L'\0');
+
+            rw_fatal (!wio.fail (), __FILE__, __LINE__,
+                      "num_put<wchar_t>::put(...) failed for locale(%#s)",
+                      data.locale_name_);
+
+#endif // _RWSTD_NO_WCHAR_T
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
             break;
     }
 
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
     rw_info (0, 0, 0,
              "testing std::num_put<charT> with %d thread%{?}s%{;}, "
-             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
              rw_opt_nthreads, 1 != rw_opt_nthreads,
              rw_opt_nloops, 1 != rw_opt_nloops,
-             int (nlocales), "%#s", locales);
+             nlocales, int (nlocales), "%#s", locales);
 
     rw_info (0, 0, 0, "exercising std::num_put<char>");
 
@@ -319,7 +405,7 @@
               "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
               rw_opt_nthreads, thread_func);
 
-    // exercise bothe the char and the wchar_t specializations
+    // exercise both the char and the wchar_t specializations
     // at the same time
 
     rw_info (0, 0, 0,
@@ -345,12 +431,28 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
     return rw_test (argc, argv, __FILE__,
                     "lib.locale.num.put",
                     "thread safety", run_test,
                     "|-nloops#0 "       // must be non-negative
-                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    "|-nthreads#0-* "   // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "     // arg must be non-negative
+                    "|-locales= "       // must be provided
+                    "|-shared-locale# ",
                     &rw_opt_nloops,
                     int (MAX_THREADS),
-                    &rw_opt_nthreads);
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
 }
diff --git a/tests/localization/22.locale.numpunct.mt.cpp b/tests/localization/22.locale.numpunct.mt.cpp
index 6db7d73..b8cda4f 100644
--- a/tests/localization/22.locale.numpunct.mt.cpp
+++ b/tests/localization/22.locale.numpunct.mt.cpp
@@ -41,18 +41,21 @@
 // maximum number of threads allowed by the command line interface
 #define MAX_THREADS   32
 
-
-#ifdef _RWSTD_REENTRANT
-int rw_opt_nthreads = 4;
-#else   // if !defined (_RWSTD_REENTRANT)
-// in non-threaded builds use just one thread
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
 int rw_opt_nthreads = 1;
-#endif   // _RWSTD_REENTRANT
 
 // the number of times each thread should iterate (unless specified
 // otherwise on the command line)
 int rw_opt_nloops = 200000;
 
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
+
 /**************************************************************************/
 
 // array of locale names to use for testing
@@ -67,18 +70,22 @@
 
 struct NumPunctData
 {
+    const char* locale_name_;
+    std::locale locale_;
+
+    std::string grouping_;
+
     char decimal_point_;
     char thousands_sep_;
-    char grouping_ [32];
-    char truename_ [32];
-    char falsename_ [32];
+    std::string truename_;
+    std::string falsename_;
 
 #ifndef _RWSTD_NO_WCHAR_T
 
     wchar_t wdecimal_point_;
     wchar_t wthousands_sep_;
-    wchar_t wtruename_ [32];
-    wchar_t wfalsename_ [32];
+    std::wstring wtruename_;
+    std::wstring wfalsename_;
 
 #endif   // _RWSTD_NO_WCHAR_T
 
@@ -98,16 +105,12 @@
 
         const std::size_t inx = std::size_t (i) % nlocales;
 
-        // save the name of the locale
-        const char* const locale_name = locales [inx];
-
-        const NumPunctData* const data = punct_data + inx;
+        const NumPunctData& data = punct_data[inx];
 
         // construct a named locale
-        const std::locale loc (locale_name);
-
-        // exercise postive and negative values
-        const int ival = i & 1 ? -i : i;
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
 
         if (test_char) {
             // exercise the narrow char specialization of the facet
@@ -121,11 +124,14 @@
             const std::string tn  = np.truename ();
             const std::string fn  = np.falsename ();
 
-            RW_ASSERT (dp == data->decimal_point_);
-            RW_ASSERT (ts == data->thousands_sep_);
-            RW_ASSERT (0 == rw_strncmp (grp.c_str (), data->grouping_));
-            RW_ASSERT (0 == rw_strncmp (tn.c_str (),  data->truename_));
-            RW_ASSERT (0 == rw_strncmp (fn.c_str (),  data->falsename_));
+            RW_ASSERT (dp == data.decimal_point_);
+            RW_ASSERT (ts == data.thousands_sep_);
+            RW_ASSERT (0 == rw_strncmp (grp.c_str (),
+                                        data.grouping_.c_str ()));
+            RW_ASSERT (0 == rw_strncmp (tn.c_str (),
+                                        data.truename_.c_str ()));
+            RW_ASSERT (0 == rw_strncmp (fn.c_str (),
+                                        data.falsename_.c_str ()));
         }
 
         // both specializations may be tested at the same time
@@ -135,20 +141,23 @@
 
 #ifndef _RWSTD_NO_WCHAR_T
 
-            const std::numpunct<wchar_t> &np =
+            const std::numpunct<wchar_t> &wp =
                 std::use_facet<std::numpunct<wchar_t> >(loc);
 
-            const wchar_t      dp  = np.decimal_point ();
-            const wchar_t      ts  = np.thousands_sep ();
-            const std::string  grp = np.grouping ();
-            const std::wstring tn  = np.truename ();
-            const std::wstring fn  = np.falsename ();
+            const wchar_t      dp  = wp.decimal_point ();
+            const wchar_t      ts  = wp.thousands_sep ();
+            const std::string  grp = wp.grouping ();
+            const std::wstring tn  = wp.truename ();
+            const std::wstring fn  = wp.falsename ();
 
-            RW_ASSERT (dp == data->wdecimal_point_);
-            RW_ASSERT (ts == data->wthousands_sep_);
-            RW_ASSERT (0 == rw_strncmp (grp.c_str (), data->grouping_));
-            RW_ASSERT (0 == rw_strncmp (tn.c_str (),  data->wtruename_));
-            RW_ASSERT (0 == rw_strncmp (fn.c_str (),  data->wfalsename_));
+            RW_ASSERT (dp == data.wdecimal_point_);
+            RW_ASSERT (ts == data.wthousands_sep_);
+            RW_ASSERT (0 == rw_strncmp (grp.c_str (),
+                                        data.grouping_.c_str ()));
+            RW_ASSERT (0 == rw_strncmp (tn.c_str (),
+                                        data.wtruename_.c_str ()));
+            RW_ASSERT (0 == rw_strncmp (fn.c_str (),
+                                        data.wfalsename_.c_str ()));
 
 #endif   // _RWSTD_NO_WCHAR_T
 
@@ -165,64 +174,67 @@
 static int
 run_test (int, char**)
 {
-    // get a NUL-separated list of names of installed locales
-    char* const locale_list = rw_locales ();
+    // find all installed locales for which setlocale(LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
 
-    const std::size_t maxinx = sizeof locales / sizeof *locales;
+    const std::size_t maxinx = sizeof punct_data / sizeof *punct_data;
 
     // iterate over locales, initializing a global punct_data array
-    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
+    for (const char *name = locale_list;
+         *name;
+         name += std::strlen (name) +1) {
 
         const std::size_t inx = nlocales;
-
         locales [inx] = name;
 
-        // set LC_NUMERIC and LC_CTYPE to be able to use mbstowcs()
-        if (std::setlocale (LC_ALL, name)) {
+        NumPunctData& data = punct_data [inx];
 
-            const std::lconv* const pconv = std::localeconv ();
-            NumPunctData* const pdata = punct_data + inx;
+        try {
+            std::locale loc(name);
+            data.locale_name_ = name;
 
-            // assign just the first character of the (potentially)
-            // multibyte decimal_point and thousands_sep (C++ locale
-            // can't deal with more)
-            pdata->decimal_point_ = *pconv->decimal_point;
-            pdata->thousands_sep_ = *pconv->thousands_sep;
+            const std::numpunct<char> &np =
+                std::use_facet<std::numpunct<char> >(loc);
 
-            // simply copy the narrow grouping
-            std::strcpy (pdata->grouping_, pconv->grouping);
+            data.grouping_ = np.grouping ();
 
-            // FIXME: this will need to change once useful truename
-            //        and falsename has been implemented
-            std::strcpy (pdata->truename_,  "true");
-            std::strcpy (pdata->falsename_, "false");
+            data.decimal_point_ = np.decimal_point ();
+            data.thousands_sep_ = np.thousands_sep ();
 
-            wchar_t tmp [2];
+            data.truename_  = np.truename ();
+            data.falsename_ = np.falsename ();
 
-            // convert multibyte decimal point and thousands separator
-            // to wide characters (assumes they are single character
-            // each -- C++ locale can't handle more)
-            std::mbstowcs (tmp, pconv->decimal_point, 2);
-            pdata->wdecimal_point_ = tmp [0];
+#ifndef _RWSTD_NO_WCHAR_T
 
-            std::mbstowcs (tmp, pconv->thousands_sep, 2);
-            pdata->wthousands_sep_ = tmp [0];
+            const std::numpunct<wchar_t> &wp =
+                std::use_facet<std::numpunct<wchar_t> >(loc);
 
-            const std::size_t n =
-                sizeof pdata->wtruename_ / sizeof (wchar_t);
+            data.wdecimal_point_ = wp.decimal_point ();
+            data.wthousands_sep_ = wp.thousands_sep ();
 
-            std::mbstowcs (pdata->wtruename_, pdata->truename_, n);
-            std::mbstowcs (pdata->wfalsename_, pdata->falsename_, n);
+            data.wtruename_  = wp.truename ();
+            data.wfalsename_ = wp.falsename ();
 
-            ++nlocales;
+#endif
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
         }
 
-        if (nlocales == maxinx)
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
             break;
     }
 
-    // reset the global locale
-    std::setlocale (LC_ALL, "C");
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
 
     rw_info (0, 0, 0,
              "testing std::numpunct<charT> with %d thread%{?}s%{;}, "
@@ -286,12 +298,28 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
     return rw_test (argc, argv, __FILE__,
                     "lib.locale.numpunct",
                     "thread safety", run_test,
                     "|-nloops#0 "       // must be non-negative
-                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    "|-nthreads#0-* "   // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "     // arg must be non-negative
+                    "|-locales= "       // must be provided
+                    "|-shared-locale# ",
                     &rw_opt_nloops,
                     int (MAX_THREADS),
-                    &rw_opt_nthreads);
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
 }
diff --git a/tests/localization/22.locale.statics.mt.cpp b/tests/localization/22.locale.statics.mt.cpp
new file mode 100644
index 0000000..47d3c7a
--- /dev/null
+++ b/tests/localization/22.locale.statics.mt.cpp
@@ -0,0 +1,197 @@
+/************************************************************************
+ *
+ * 22.locale.statics.mt.cpp
+ *
+ * test exercising the thread safety of [lib.locale.statics]
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2007 Rogue Wave Software, Inc.
+ *
+ **************************************************************************/
+
+#include <locale>        // for locale
+#include <cstring>       // for strlen()
+
+#include <rw_locale.h>   // for rw_locales()
+#include <rw_thread.h>   // for rw_get_processors(), rw_thread_pool()
+#include <driver.h>      // for rw_test()
+
+
+// maximum number of threads allowed by the command line interface
+#define MAX_THREADS   16
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int opt_nthreads = 1;
+
+// the number of times each thread should iterate (unless specified
+// otherwise on the command line)
+int opt_nloops = 20000;
+
+int opt_classic;
+int opt_global;
+
+/**************************************************************************/
+
+// array of locale objects to use for testing
+static std::locale
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+extern "C" {
+
+static void*
+test_classic (void*)
+{
+    static volatile int nthreads;
+
+    _RWSTD_ATOMIC_PREINCREMENT (nthreads, false);
+
+    // spin until all threads have been created in order to icrease
+    // the odds that at least two of them will hit the tested function
+    // (and the lazy one-time initialization done by it) at the same
+    // time
+    while (nthreads < opt_nthreads);
+
+    const std::locale classic (std::locale::classic ());
+
+    _RWSTD_UNUSED (classic);
+
+    return 0;
+}
+
+
+static void*
+test_global (void*)
+{
+    for (int i = 0; i != opt_nloops; ++i) {
+
+        const int inx = i % nlocales;
+
+        const std::locale last (std::locale::global (locales [inx]));
+
+        _RWSTD_UNUSED (last);
+
+        // FIXME: verify the consistency of the returned locale
+        // by making sure that it matches the locale passed to
+        // global() made by the last call to the function by
+        // the last thread
+    }
+    
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    int result = 0;
+
+    if (rw_note (0 <= opt_classic, 0, __LINE__,
+                 "std::locale::classic() test disabled")) {
+
+        rw_info (0, 0, 0,
+                 "testing std::locale::classic() with %d thread%{?}s%{;}",
+                 opt_nthreads, 1 != opt_nthreads);
+
+        // create and start a pool of threads and wait for them to finish
+        result = rw_thread_pool (0, std::size_t (opt_nthreads), 0,
+                                 test_classic, 0);
+    }
+
+    if (rw_note (0 <= opt_global, 0, __LINE__,
+                 "std::locale::global(const std::locale&) test disabled")) {
+
+
+        // find all installed locales for which setlocale(LC_ALL) succeeds
+        const char* const locale_list =
+            rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+        const std::size_t maxinx = sizeof locales / sizeof *locales;
+
+        const char* locale_names [MAX_THREADS];
+
+        for (const char *name = locale_list;
+             *name;
+             name += std::strlen (name) + 1) {
+
+            locale_names [nlocales] = name;
+            locales [nlocales++]    = std::locale (name);
+
+            if (nlocales == maxinx)
+                break;
+        }
+
+        rw_info (0, 0, 0,
+                 "testing std::locale::global(const std::locale&) with "
+                 "%d thread%{?}s%{;}, %zu iteration%{?}s%{;} each, in "
+                 "%zu locales { %{ .*A@} }",
+                 opt_nthreads, 1 != opt_nthreads,
+                 opt_nloops, 1 != opt_nloops,
+                 nlocales, int (nlocales), "%#s", locale_names);
+
+        // create and start a pool of threads and wait for them to finish
+        result = rw_thread_pool (0, std::size_t (opt_nthreads), 0,
+                                 test_global, 0);
+    }
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    opt_nthreads = rw_get_cpus ();
+    if (opt_nthreads < 2)
+        opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.statics",
+                    "thread safety",
+                    run_test,
+                    "|-classic~ "
+                    "|-global~ "
+                    "|-nloops#0 "        // arg must be non-negative
+                    "|-nthreads#0-* "    // arg must be in [0, MAX_THREADS]
+                    "|-locales= ",       // argument must be provided
+                    &opt_classic,
+                    &opt_global,
+                    &opt_nloops,
+                    int (MAX_THREADS),
+                    &opt_nthreads,
+                    &rw_opt_setlocales);
+}
diff --git a/tests/localization/22.locale.time.get.mt.cpp b/tests/localization/22.locale.time.get.mt.cpp
new file mode 100644
index 0000000..70f40e3
--- /dev/null
+++ b/tests/localization/22.locale.time.get.mt.cpp
@@ -0,0 +1,527 @@
+/************************************************************************
+ *
+ * 22.locale.time.get.mt.cpp
+ *
+ * test exercising the thread safety of the time_get facet
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2002-2007 Rogue Wave Software.
+ * 
+ **************************************************************************/
+#include <ios>        // for ios
+#include <iterator>   // for ostreambuf_iterator
+#include <locale>     // for locale, time_put
+#include <cstring>    // for strlen ()
+#include <ctime>      // for tm
+
+#include <rw_locale.h>
+#include <rw_thread.h>
+#include <driver.h>    // for rw_assert ()
+#include <valcmp.h>    // for rw_strncmp ()
+
+#define MAX_THREADS      32
+#define MAX_LOOPS    100000
+
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
+int rw_opt_nthreads = 1;
+
+// the number of times each thread should iterate
+int rw_opt_nloops = 50000;
+
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
+
+/**************************************************************************/
+
+// array of locale names to use for testing
+static const char*
+locales [MAX_THREADS];
+
+// number of locale names in the array
+static std::size_t
+nlocales;
+
+/**************************************************************************/
+
+//
+struct MyTimeData
+{
+    enum { BufferSize = 64 };
+
+    // name of the locale the data corresponds to
+    const char* locale_name_;
+
+    // optionally set to the named locale for threads to share
+    std::locale locale_;
+
+    // the time struct used to generate strings below
+    std::tm time_;
+
+    // the type specifier
+    char format_;
+
+    // narrow representations of time_ given the 
+    // locale_name_ and the format_
+    char ncs_ [BufferSize];
+    
+#ifndef _RWSTD_NO_WCHAR_T
+
+    // wide representations of time_
+    wchar_t wcs_ [BufferSize];
+
+#endif // _RWSTD_NO_WCHAR_T
+
+} my_time_data [MAX_THREADS];
+
+
+template <class charT, class Traits>
+struct MyIos: std::basic_ios<charT, Traits>
+{
+    MyIos () {
+        this->init (0);
+    }
+};
+
+
+template <class charT, class Traits>
+struct MyStreambuf: std::basic_streambuf<charT, Traits>
+{
+    typedef std::basic_streambuf<charT, Traits> Base;
+
+    MyStreambuf ()
+        : Base () {
+    }
+
+    void pubsetg (const charT *gbeg, std::streamsize n) {
+        this->setg (_RWSTD_CONST_CAST (charT*, gbeg),
+                    _RWSTD_CONST_CAST (charT*, gbeg),
+                    _RWSTD_CONST_CAST (charT*, gbeg) + n);
+    }
+
+    void pubsetp (charT *pbeg, std::streamsize n) {
+        this->setp (pbeg, pbeg + n);
+    }
+};
+
+void verify_fields (const std::tm& a, const std::tm& b)
+{
+    RW_ASSERT (a.tm_sec  == b.tm_sec);
+    RW_ASSERT (a.tm_min  == b.tm_min);
+    RW_ASSERT (a.tm_hour == b.tm_hour);
+    RW_ASSERT (a.tm_mday == b.tm_mday);
+    RW_ASSERT (a.tm_mon  == b.tm_mon);
+    RW_ASSERT (a.tm_year == b.tm_year);
+    RW_ASSERT (a.tm_wday == b.tm_wday);
+    RW_ASSERT (a.tm_yday == b.tm_yday);
+}
+#define RW_ASSERT_FIELDS(a,b) verify_fields(a,b)
+
+extern "C" {
+
+bool test_char;    // exercise time_get<char>
+bool test_wchar;   // exercise time_get<wchar_t>
+
+
+static void*
+thread_func (void*)
+{
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
+
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
+
+    std::ios_base::iostate state = std::ios_base::goodbit;
+
+    std::tm local;
+    for (int i = 0; i != rw_opt_nloops; ++i) {
+
+        // save the name of the locale
+        const MyTimeData& data = my_time_data [i % nlocales];
+
+        // construct a named locale, get a reference to the time_put
+        // facet from it and use it to format a random time value
+        // using a random conversion specifier
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
+
+        if (test_char) {
+            // exercise the narrow char specialization of the facet
+
+            const std::time_get<char> &ng =
+                std::use_facet<std::time_get<char> >(loc);
+
+            nio.imbue (loc);
+            nsb.pubsetg (data.ncs_, RW_COUNT_OF (data.ncs_));
+            
+            const std::istreambuf_iterator<char> iter (&nsb);
+            const std::istreambuf_iterator<char> end;
+
+            std::memset (&local, 0, sizeof local);
+
+            switch (data.format_) {
+            case 'X':
+                ng.get_time (iter, end, nio, state, &local);
+                break;
+            case 'x':
+                ng.get_date (iter, end, nio, state, &local);
+                break;
+            case 'a':
+            case 'A':
+                ng.get_weekday (iter, end, nio, state, &local);
+                break;
+            case 'b':
+            case 'B':
+                ng.get_monthname (iter, end, nio, state, &local);
+                break;
+            case 'y':
+            case 'Y':
+                ng.get_year (iter, end, nio, state, &local);
+                break;
+            default:
+
+#ifndef _RWSTD_NO_EXT_TIME_GET
+                ng.get (iter, end, nio, state, &local, data.format_);
+#endif  // _RWSTD_NO_EXT_TIME_GET
+
+                break;
+            }
+
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT_FIELDS (local, data.time_);
+        }
+
+        // both specializations may be tested at the same time
+
+        if (test_wchar) {
+            // exercise the wide char specialization of the facet
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::time_get<wchar_t> &wg =
+                std::use_facet<std::time_get<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetg (data.wcs_, RW_COUNT_OF (data.wcs_));
+
+            const std::istreambuf_iterator<wchar_t> iter (&wsb);
+            const std::istreambuf_iterator<wchar_t> end;
+
+            std::memset (&local, 0, sizeof local);
+            
+            switch (data.format_) {
+            case 'X':
+                wg.get_time (iter, end, wio, state, &local);
+                break;
+            case 'x':
+                wg.get_date (iter, end, wio, state, &local);
+                break;
+            case 'a':
+            case 'A':
+                wg.get_weekday (iter, end, wio, state, &local);
+                break;
+            case 'b':
+            case 'B':
+                wg.get_monthname (iter, end, wio, state, &local);
+                break;
+            case 'y':
+            case 'Y':
+                wg.get_year (iter, end, wio, state, &local);
+                break;
+            default:
+
+#ifndef _RWSTD_NO_EXT_TIME_GET
+                wg.get (iter, end, wio, state, &local, data.format_);
+#endif  // _RWSTD_NO_EXT_TIME_GET
+
+                break;
+            }
+
+            RW_ASSERT (! (state & std::ios_base::failbit));
+            RW_ASSERT_FIELDS (local, data.time_);
+
+#endif // _RWSTD_NO_WCHAR_T
+
+        }
+    }
+
+    return 0;
+}
+
+}   // extern "C"
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
+
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
+
+    // find all installed locales for which setlocale (LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
+
+    const std::size_t maxinx = RW_COUNT_OF (locales);
+
+    int j = 0;
+    for (const char* name = locale_list;
+         *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+        locales [inx] = name;
+
+        // fill in the time and results for this locale
+        MyTimeData& data = my_time_data [inx];
+        data.locale_name_ = name;
+
+        // initialize tm with random but valid values
+        std::memset (&data.time_, 0, sizeof data.time_);
+        data.time_.tm_sec  = ++j % 61;
+        data.time_.tm_min  = ++j % 60;
+        data.time_.tm_hour = ++j % 12;
+        data.time_.tm_wday = ++j % 7;
+        data.time_.tm_mon  = ++j % 12;
+        data.time_.tm_mday = ++j % 31;
+        data.time_.tm_yday = ++j % 366;
+        data.time_.tm_year = ++j;
+
+#ifndef _RWSTD_NO_EXT_TIME_GET
+        // format specifiers that we can reliably parse
+        // get_weekday, get_monthname, get_date, get_time,
+        // get_year and the extension get.
+        const char formats [] = "aAbBCdhHjmMnRStTwxXyY";
+#else
+        // formats that generate strings compatible with
+        // get_weekday, get_monthname, get_date, get_time
+        // and get_year.
+        const char formats [] = "aAbBxXyY";
+#endif
+
+        // get the "random" data type used to generate representation
+        data.format_ = formats [nlocales % (sizeof formats - 1)];
+
+        try {
+            const std::locale loc (data.locale_name_);
+
+            const std::time_put<char> &np =
+                std::use_facet<std::time_put<char> >(loc);
+
+            const std::time_get<char> &ng = 
+                std::use_facet<std::time_get<char> >(loc);
+
+            std::ios::iostate state = std::ios::goodbit;
+
+            nio.imbue (loc);
+
+            // put the time representation on the stream
+            nsb.pubsetp (data.ncs_, RW_COUNT_OF (data.ncs_));
+            *np.put (std::ostreambuf_iterator<char>(&nsb), nio, ' ',
+                     &data.time_, data.format_) = '\0';
+
+            rw_fatal (!nio.fail (), __FILE__, __LINE__,
+                      "time_put<char>::put(...) failed for locale(%#s)",
+                      data.locale_name_);
+
+            // read the data back out. this is what the thread
+            // is expected to do, and the result it should get.
+
+            nsb.pubsetg (data.ncs_, RW_COUNT_OF (data.ncs_));
+
+            const std::istreambuf_iterator<char> iter (&nsb);
+            const std::istreambuf_iterator<char> end;
+
+            std::memset (&data.time_, 0, sizeof data.time_);
+
+            switch (data.format_) {
+            case 'a':
+            case 'A':
+                ng.get_weekday (iter, end, nio, state, &data.time_);
+                break;
+            case 'b':
+            case 'B':
+            case 'h':
+                ng.get_monthname (iter, end, nio, state, &data.time_);
+                break;
+            case 'y':
+            case 'Y':
+                ng.get_year (iter, end, nio, state, &data.time_);
+                break;
+            case 'x':
+                ng.get_date (iter, end, nio, state, &data.time_);
+                break;
+            case 'X':
+                ng.get_time (iter, end, nio, state, &data.time_);
+                break;
+            default:
+
+#ifndef _RWSTD_NO_EXT_TIME_GET
+                ng.get (iter, end, nio, state, &data.time_, data.format_);
+#endif  // _RWSTD_NO_EXT_TIME_GET
+
+                break;
+            }
+
+            // we couldn't read the data back, so don't use this locale
+            if (state & std::ios_base::failbit)
+                continue;
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::time_put<wchar_t> &wp =
+                std::use_facet<std::time_put<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetp (data.wcs_, RW_COUNT_OF (data.wcs_));
+
+            *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                     wio, L' ', &data.time_, data.format_) = L'\0';
+
+            rw_fatal (!wio.fail (), __FILE__, __LINE__,
+                      "time_put<wchar_t>::put(...) failed for locale(%#s)",
+                      data.locale_name_);
+
+#endif // _RWSTD_NO_WCHAR_T
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
+            break;
+    }
+
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
+    rw_info (0, 0, 0,
+             "testing std::time_get<charT> with %d thread%{?}s%{;}, "
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
+             rw_opt_nthreads, 1 != rw_opt_nthreads,
+             rw_opt_nloops, 1 != rw_opt_nloops,
+             nlocales, int (nlocales), "%#s", locales);
+
+    rw_info (0, 0, 0, "exercising std::time_get<char>");
+
+    test_char  = true;
+    test_wchar = false;
+
+    // create and start a pool of threads and wait for them to finish
+    int result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#ifndef _RWSTD_NO_WCHAR_T
+
+    rw_info (0, 0, 0, "exercising std::time_get<wchar_t>");
+
+    test_char  = false;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+    // exercise both the char and the wchar_t specializations
+    // at the same time
+
+    rw_info (0, 0, 0,
+             "exercising both std::time_get<char> and std::time_get<wchar_t>");
+
+    test_char  = true;
+    test_wchar = true;
+
+    // start a pool of threads to exercise wstring thread safety
+    result =
+        rw_thread_pool (0, std::size_t (rw_opt_nthreads), 0, thread_func, 0);
+
+    rw_error (result == 0, 0, __LINE__,
+              "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
+              rw_opt_nthreads, thread_func);
+
+#endif   // _RWSTD_NO_WCHAR_T
+
+    return result;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.time.get",
+                    "thread safety", run_test,
+                    "|-nloops#0 "       // must be non-negative
+                    "|-nthreads#0-* "   // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "     // arg must be non-negative
+                    "|-locales= "       // must be provided
+                    "|-shared-locale# ",
+                    &rw_opt_nloops,
+                    int (MAX_THREADS),
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
+}
diff --git a/tests/localization/22.locale.time.put.mt.cpp b/tests/localization/22.locale.time.put.mt.cpp
index c57c503..71a04c6 100644
--- a/tests/localization/22.locale.time.put.mt.cpp
+++ b/tests/localization/22.locale.time.put.mt.cpp
@@ -32,28 +32,31 @@
 #include <iterator>   // for ostreambuf_iterator
 #include <locale>     // for locale, time_put
 
-#include <cstring>    // for strlen()
+#include <cstring>    // for strlen ()
 #include <ctime>      // for tm
 
 #include <rw_locale.h>
 #include <rw_thread.h>
-#include <driver.h>
-
+#include <driver.h>    // for rw_assert ()
+#include <valcmp.h>    // for rw_strncmp ()
 
 #define MAX_THREADS      32
 #define MAX_LOOPS    100000
 
-
-#ifdef _RWSTD_REENTRANT
-int rw_opt_nthreads = 4;
-#else   // if !defined (_RWSTD_REENTRANT)
-// in non-threaded builds use just one thread
+// default number of threads (will be adjusted to the number
+// of processors/cores later)
 int rw_opt_nthreads = 1;
-#endif   // _RWSTD_REENTRANT
 
 // the number of times each thread should iterate
 int rw_opt_nloops = MAX_LOOPS;
 
+// number of locales to use
+int rw_opt_nlocales = MAX_THREADS;
+
+// should all threads share the same set of locale objects instead
+// of creating their own?
+int rw_opt_shared_locale;
+
 /**************************************************************************/
 
 // array of locale names to use for testing
@@ -66,6 +69,61 @@
 
 /**************************************************************************/
 
+//
+struct MyTimeData
+{
+    enum { BufferSize = 64 };
+
+    // name of the locale the data corresponds to
+    const char* locale_name_;
+
+    // optionally set to the named locale for threads to share
+    std::locale locale_;
+
+    // the time struct used to generate strings below
+    std::tm time_;
+
+    // the format specifier
+    char format_;
+
+    // narrow representations of time_ given the 
+    // locale_name_ and the format_
+    char ncs_ [BufferSize];
+    
+#ifndef _RWSTD_NO_WCHAR_T
+
+    // wide representations of time_
+    wchar_t wcs_ [BufferSize];
+
+#endif // _RWSTD_NO_WCHAR_T
+
+} my_time_data [MAX_THREADS];
+
+
+template <class charT, class Traits>
+struct MyIos: std::basic_ios<charT, Traits>
+{
+    MyIos () {
+        this->init (0);
+    }
+};
+
+
+template <class charT, class Traits>
+struct MyStreambuf: std::basic_streambuf<charT, Traits>
+{
+    typedef std::basic_streambuf<charT, Traits> Base;
+
+    MyStreambuf ()
+        : Base () {
+    }
+
+    void pubsetp (charT *pbeg, std::streamsize n) {
+        this->setp (pbeg, pbeg + n);
+    }
+};
+
+
 extern "C" {
 
 bool test_char;    // exercise time_put<char>
@@ -73,60 +131,31 @@
 
 
 static void*
-thread_func (void *arg)
+thread_func (void*)
 {
-    const rw_thread_t* const pthread = (rw_thread_t*)arg;
-
-    // get the 0-based thread number
-    const std::size_t threadno = std::size_t (pthread->threadno);
-
-    std::tm tmb = std::tm ();
-
-    const char cvtspecs[] = "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%";
-
-    // dummy streambuf-derived object the doesn't do anything
-    // but allows ostreambuf_iterator to "think" it can write
-    // to it
-    struct NarrowBuf: std::streambuf {
-        int_type overflow (int_type c) { return c; }
-    } sb;
+    char              ncs [MyTimeData::BufferSize];
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
 
 #ifndef _RWSTD_NO_WCHAR_T
+    wchar_t                 wcs [MyTimeData::BufferSize];
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
 
-    struct WideBuf: std::wstreambuf {
-        int_type overflow (int_type c) { return c; }
-    } wsb;
-
-#endif   // _RWSTD_NO_WCHAR_T
-
-    struct Ios: std::ios {
-        Ios () { this->init (0); }
-    } io;
-
-    int j = 0;
-
-    for (int i = 0; i != rw_opt_nloops; ++i, ++j) {
-
-        // initialize tm with random but valid values
-        tmb.tm_sec  = ++j % 61;
-        tmb.tm_min  = ++j % 60;
-        tmb.tm_min  = ++j % 60;
-        tmb.tm_wday = ++j % 7;
-        tmb.tm_mon  = ++j % 12;
-        tmb.tm_year = ++j;
-
-        // generate a "random" conversion specifier from the set
-        // of valid specifiers recognized by the facet to exercise
-        // all (or most) code paths
-        const char cvt = cvtspecs [i % (sizeof cvtspecs - 1)];
+    for (int i = 0; i != rw_opt_nloops; ++i) {
 
         // save the name of the locale
-        const char* const locale_name = locales [i % nlocales];
+        const MyTimeData& data = my_time_data [i % nlocales];
 
         // construct a named locale, get a reference to the time_put
         // facet from it and use it to format a random time value
         // using a random conversion specifier
-        const std::locale loc (locale_name);
+        const std::locale loc =
+            rw_opt_shared_locale ? data.locale_
+                                 : std::locale (data.locale_name_);
 
         if (test_char) {
             // exercise the narrow char specialization of the facet
@@ -134,10 +163,15 @@
             const std::time_put<char> &tp =
                 std::use_facet<std::time_put<char> >(loc);
 
-            // format a "random" but valid tm value using the random
-            // format specifier
-            tp.put (std::ostreambuf_iterator<char>(&sb),
-                    io, ' ', &tmb, cvt);
+            nio.imbue (loc);
+            nsb.pubsetp (ncs, RW_COUNT_OF (ncs));
+
+            // format time using provided format specifier
+            *tp.put (std::ostreambuf_iterator<char>(&nsb),
+                     nio, ' ', &data.time_, data.format_) = '\0';
+
+            RW_ASSERT (!nio.fail ());
+            RW_ASSERT (!rw_strncmp(ncs, data.ncs_));
 
         }
 
@@ -148,13 +182,19 @@
 
 #ifndef _RWSTD_NO_WCHAR_T
 
-            const std::time_put<wchar_t> &wtp =
+            const std::time_put<wchar_t> &wp =
                 std::use_facet<std::time_put<wchar_t> >(loc);
 
-            wtp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
-                     io, L' ', &tmb, cvt);
+            wio.imbue (loc);
+            wsb.pubsetp (wcs, RW_COUNT_OF (wcs));
 
-#endif   // _RWSTD_NO_WCHAR_T
+            *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                     wio, L' ', &data.time_, data.format_) = L'\0';
+
+            RW_ASSERT (!wio.fail ());
+            RW_ASSERT (!rw_strncmp(wcs, data.wcs_));
+
+#endif // _RWSTD_NO_WCHAR_T
 
         }
     }
@@ -169,23 +209,110 @@
 static int
 run_test (int, char**)
 {
-    char* const locale_list = rw_locales ();
+    MyIos<char, std::char_traits<char> >       nio;
+    MyStreambuf<char, std::char_traits<char> > nsb;
+    nio.rdbuf (&nsb);
 
-    const std::size_t maxinx = sizeof locales / sizeof *locales;
+#ifndef _RWSTD_NO_WCHAR_T
+    MyIos<wchar_t, std::char_traits<wchar_t> >       wio;
+    MyStreambuf<wchar_t, std::char_traits<wchar_t> > wsb;
+    wio.rdbuf (&wsb);
+#endif // _RWSTD_NO_WCHAR_T
 
-    for (char *name = locale_list; *name; name += std::strlen (name) + 1) {
-        locales [nlocales++] = name;
+    // find all installed locales for which setlocale (LC_ALL) succeeds
+    const char* const locale_list =
+        rw_opt_locales ? rw_opt_locales : rw_locales (_RWSTD_LC_ALL);
 
-        if (nlocales == maxinx)
+    const std::size_t maxinx = RW_COUNT_OF (locales);
+
+    int j = 0;
+    for (const char* name = locale_list;
+         *name;
+         name += std::strlen (name) + 1) {
+
+        const std::size_t inx = nlocales;
+        locales [inx] = name;
+
+        // fill in the time and results for this locale
+        MyTimeData& data = my_time_data [inx];
+        data.locale_name_ = name;
+
+        // initialize tm with random but valid values
+        data.time_.tm_sec  = ++j % 61;
+        data.time_.tm_min  = ++j % 60;
+        data.time_.tm_hour = ++j % 12;
+        data.time_.tm_wday = ++j % 7;
+        data.time_.tm_mon  = ++j % 12;
+        data.time_.tm_mday = ++j % 31;
+        data.time_.tm_yday = ++j % 366;
+        data.time_.tm_year = ++j;
+
+        const char cvtspecs[] = "aAbBcCdDeFgGhHIjmMnprRStTuUVwWxXyYzZ%";
+
+        // get the "random" conversion specifier used to generate
+        // the result string
+        data.format_ = cvtspecs [nlocales % (sizeof cvtspecs - 1)];
+
+        try {
+            const std::locale loc (data.locale_name_);
+
+            const std::time_put<char> &np =
+                std::use_facet<std::time_put<char> >(loc);
+
+            nio.imbue (loc);
+            nsb.pubsetp (data.ncs_, RW_COUNT_OF (data.ncs_));
+            
+            *np.put (std::ostreambuf_iterator<char>(&nsb),
+                     nio, ' ', &data.time_, data.format_) = '\0';
+
+            rw_fatal (!nio.fail (), __FILE__, __LINE__,
+                      "time_put<char>::put(..., %c) "
+                      "failed for locale(%#s)",
+                      data.format_, data.locale_name_);
+            
+#ifndef _RWSTD_NO_WCHAR_T
+
+            const std::time_put<wchar_t> &wp =
+                std::use_facet<std::time_put<wchar_t> >(loc);
+
+            wio.imbue (loc);
+            wsb.pubsetp (data.wcs_, RW_COUNT_OF (data.wcs_));
+            
+            *wp.put (std::ostreambuf_iterator<wchar_t>(&wsb),
+                     wio, L' ', &data.time_, data.format_) = L'\0';
+            
+            rw_fatal (!wio.fail (), __FILE__, __LINE__,
+                      "time_put<wchar_t>::put(..., %c) "
+                      "failed for locale(%#s)",
+                      data.format_, data.locale_name_);
+
+#endif // _RWSTD_NO_WCHAR_T
+
+            if (rw_opt_shared_locale)
+                data.locale_ = loc;
+
+            nlocales += 1;
+
+        }
+        catch (...) {
+            rw_warn (!rw_opt_locales, 0, __LINE__,
+                     "failed to create locale(%#s)", name);
+        }
+
+        if (nlocales == maxinx || nlocales == std::size_t (rw_opt_nlocales))
             break;
     }
 
+    // avoid divide by zero in thread if there are no locales to test
+    rw_fatal (nlocales != 0, 0, __LINE__,
+              "failed to create one or more usable locales!");
+
     rw_info (0, 0, 0,
              "testing std::time_put<charT> with %d thread%{?}s%{;}, "
-             "%zu iteration%{?}s%{;} each, in locales { %{ .*A@} }",
+             "%zu iteration%{?}s%{;} each, in %zu locales { %{ .*A@} }",
              rw_opt_nthreads, 1 != rw_opt_nthreads,
              rw_opt_nloops, 1 != rw_opt_nloops,
-             int (nlocales), "%#s", locales);
+             nlocales, int (nlocales), "%#s", locales);
 
     rw_info (0, 0, 0, "exercising std::time_put<char>");
 
@@ -215,7 +342,7 @@
               "rw_thread_pool(0, %d, 0, %{#f}, 0) failed",
               rw_opt_nthreads, thread_func);
 
-    // exercise bothe the char and the wchar_t specializations
+    // exercise both the char and the wchar_t specializations
     // at the same time
 
     rw_info (0, 0, 0,
@@ -241,12 +368,28 @@
 
 int main (int argc, char *argv[])
 {
+#ifdef _RWSTD_REENTRANT
+
+    // set nthreads to the greater of the number of processors
+    // and 2 (for uniprocessor systems) by default
+    rw_opt_nthreads = rw_get_cpus ();
+    if (rw_opt_nthreads < 2)
+        rw_opt_nthreads = 2;
+
+#endif   // _RWSTD_REENTRANT
+
     return rw_test (argc, argv, __FILE__,
                     "lib.locale.time.put",
                     "thread safety", run_test,
                     "|-nloops#0 "       // must be non-negative
-                    "|-nthreads#0-*",   // must be in [0, MAX_THREADS]
+                    "|-nthreads#0-* "   // must be in [0, MAX_THREADS]
+                    "|-nlocales#0 "     // arg must be non-negative
+                    "|-locales= "       // must be provided
+                    "|-shared-locale# ",
                     &rw_opt_nloops,
                     int (MAX_THREADS),
-                    &rw_opt_nthreads);
+                    &rw_opt_nthreads,
+                    &rw_opt_nlocales,
+                    &rw_opt_setlocales,
+                    &rw_opt_shared_locale);
 }
diff --git a/tests/numerics/26.valarray.cassign.cpp b/tests/numerics/26.valarray.cassign.cpp
new file mode 100644
index 0000000..fb1f6ce
--- /dev/null
+++ b/tests/numerics/26.valarray.cassign.cpp
@@ -0,0 +1,842 @@
+/***************************************************************************
+ *
+ * 26.valarray.cassign.cpp - tests exercising valarray computed assignment
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright (C) 2007 Rogue Wave Software, Inc.
+ *
+ **************************************************************************/
+
+#include <cstdlib>       // for free(), strtod(), size_t
+#include <valarray>      // for indirect_array, valarray
+
+#include <rw_value.h>    // for UserClass
+#include <driver.h>      // for rw_test()
+#include <rw_printf.h>   // for rw_asnprintf()
+
+/**************************************************************************/
+
+// returns an array of size elements of type T constructed from a string
+// of comma-separated values
+template <class T>
+T*
+make_array (const T*, const char *s, std::size_t *psize)
+{
+    std::size_t bufsize = 0;   // capacity of buffer
+    std::size_t nelems  = 0;   // number of elements in buffer
+
+    if (psize)
+        *psize = 0;
+
+    if (0 == s)
+        s = "";
+
+    T* buf = 0;
+
+    while (*s) {
+
+        // get the next value from the string
+        char *end = 0;
+        const double val = std::strtod (s, &end);
+
+        unsigned long repeat = 1;
+        
+        if ('@' == *end) {
+            // process repeat directive (e.g., "123@5" expands into
+            // 5 copies of the number 123)
+            char *e = 0;
+            repeat = std::strtoul (++end, &e, 10);
+
+            // skip trailing whitespace
+            for (; ' ' == *end; ++end);
+
+            // the next character must be either a NUL or comma
+            RW_ASSERT ('\0' == *e || ',' == *e);
+
+            if (',' == *e)
+                ++e;
+
+            s = e;
+        }
+        else {
+            // skip trailing whitespace
+            for (; ' ' == *end; ++end);
+
+            // the next character must be NUL or a comma
+            RW_ASSERT ('\0' == *end || ',' == *end);
+            s = end;
+
+            if (*s)
+                ++s;
+        }
+
+        while (repeat--) {
+
+            if (nelems == bufsize) {
+                // reallocate buffer
+
+                const std::size_t newsize = (bufsize + 1) * 2;
+                T* const tmp = new T [newsize];
+
+                // copy data to the newly allocated buffer
+                for (std::size_t i = 0; i != nelems; ++i)
+                     tmp [i] = buf [i];
+
+                // increase the capacity
+                bufsize = newsize;
+
+                // deallocate old buffer
+                delete[] buf;
+                buf = tmp;
+            }
+
+            // append value to the end of the buffer
+            buf [nelems++] = T (val);
+        }
+    }
+
+    if (psize)
+        *psize = nelems;
+
+    return buf;
+}
+
+
+// deletes an array of elements of type T returned from make_array
+template <class T>
+void
+delete_array (const T *array, std::size_t)
+{
+    T* const a = _RWSTD_CONST_CAST (T*, array);
+    delete[] a;
+}
+
+
+template <class T>
+const std::size_t* count (const T*) { return 0; }
+
+
+template <class T>
+T value (const T &val) { return val; }
+
+/**************************************************************************/
+
+// deletes an array of elements of type T returned from make_array
+void
+delete_array (const UserClass *array, std::size_t nelems)
+{
+    UserClass* const a = _RWSTD_CONST_CAST (UserClass*, array);
+    
+    for (std::size_t i = 0; i != nelems; ++i)
+        (a + i)->~UserClass ();
+
+    operator delete (a);
+}
+
+
+// returns an array of size elements of type UserClass
+// constructed from a string of comma-separated values
+UserClass*
+make_array (const UserClass*, const char *s, std::size_t *psize)
+{
+    std::size_t bufsize = 0;   // capacity of buffer
+    std::size_t nelems  = 0;   // number of elements in buffer
+
+    if (psize)
+        *psize = 0;
+
+    if (0 == s)
+        s = "";
+
+    UserClass* buf = 0;
+
+    while (*s) {
+
+        // get the next value from the string
+        char *end = 0;
+        const double val = std::strtod (s, &end);
+
+        unsigned long repeat = 1;
+        
+        if ('@' == *end) {
+            // process repeat directive (e.g., "123@5" expands into
+            // 5 copies of the number 123)
+            char *e = 0;
+            repeat = std::strtoul (++end, &e, 10);
+
+            // skip trailing whitespace
+            for (; ' ' == *end; ++end);
+
+            // the next character must be either a NUL or comma
+            RW_ASSERT ('\0' == *e || ',' == *e);
+
+            if (',' == *e)
+                ++e;
+
+            s = e;
+        }
+        else {
+            // skip trailing whitespace
+            for (; ' ' == *end; ++end);
+
+            // the next character must be NUL or  a comma
+            RW_ASSERT ('\0' == *end || ',' == *end);
+
+            s = end;
+            if (*s)
+                ++s;
+        }
+
+        while (repeat--) {
+
+            if (nelems == bufsize) {
+                static const std::size_t size = sizeof (UserClass);
+
+                void* const raw = operator new ((bufsize + 1) * 2 * size);
+                UserClass* const tmp = _RWSTD_STATIC_CAST (UserClass*, raw);
+
+                for (std::size_t i = 0; i != nelems; ++i)
+                    new (tmp +i) UserClass (buf [i]);
+
+                bufsize = (bufsize + 1) * 2;
+
+                delete_array (buf, nelems);
+                buf = tmp;
+            }
+
+            new (buf + nelems) UserClass ();
+            buf [nelems].data_.val_ = int (val);
+            ++nelems;
+        }
+    }
+
+    if (psize)
+        *psize = nelems;
+
+    return buf;
+}
+
+
+const std::size_t* count (const UserClass*) { return &UserClass::count_; }
+
+int value (const UserClass &val) { return val.data_.val_; }
+
+/**************************************************************************/
+
+template <class T>
+void
+test_op_assign (const T*,
+                std::valarray<T>&
+                (std::valarray<T>::*op_assign)(const std::valarray<T>&),
+                const char *tname,     // T's type name
+                const char *opname,    // which assignment operator
+                int         line,      // test case line number
+                const char *lhs_str,   // left hand side of assignment
+                const char *rhs_str,   // right hand side of assignment
+                const char *res_str)   // result of assignment
+{
+    std::size_t nelems = 0;
+    std::size_t tmp;
+
+    // create an array of values of type T from the string lhs_str
+    // representing the left-hand side argument of the assignment
+    const T* const lhs_array = make_array ((const T*)0, lhs_str, &nelems);
+
+    // create an array of values of type T from the string rhs_str
+    // representing the right-hand side argument of the assignment
+    const T* const rhs_array = make_array ((const T*)0, rhs_str, &tmp);
+
+    // both arguments of the assignment must have the same size
+    RW_ASSERT (tmp == nelems);
+
+    // create an array of values of type T from the string res_str
+    // representing the result of the assignment
+    const T* const res_array = make_array ((const T*)0, res_str, &tmp);
+
+    // the result of the assignment must have the same size as both
+    // arguments
+    RW_ASSERT (tmp == nelems);
+
+    // construct valarray arguments from the arrays created above
+    /* const */ std::valarray<T> lhs_va (lhs_array, nelems);
+    const       std::valarray<T> rhs_va (rhs_array, nelems);
+
+    char*       fname = 0;
+    std::size_t size  = 0;
+
+    // pointer to a counter keeping track of all objects of type T
+    // in existence (non-null only for T=UserClass)
+    const std::size_t* const pcounter = count ((const T*)0);
+
+    // get the number of objects of type T (only possible for user
+    // defined T) before invoking the operator
+    std::size_t nobjects = pcounter ? *pcounter : 0;
+
+    // format the name of the function call to be used in diagnostic
+    // messages below
+    rw_asnprintf (&fname, &size,
+                  "valarray<%s>(%s) %s std::valarray<%1$s>(%s)",
+                  tname, lhs_str, opname, rhs_str);
+
+    // invoke the assignment operator through the member pointer
+    std::valarray<T> &res = (lhs_va.*op_assign)(rhs_va);
+
+    // verify that the resturned reference refers to the assignee
+    rw_assert (&res == &lhs_va, 0, line,
+               "line %d == %#p, got %#p",
+               __LINE__, fname, &lhs_va, &res);
+    
+
+    // verify the size of the array
+    rw_assert (lhs_va.size () == nelems, 0, line,
+               "line %d. %s.size() == %zu, got %zu",
+               __LINE__, fname, nelems, lhs_va.size ());
+
+    if (pcounter) {
+        // verify that the assignment didn't leak any objects
+        nobjects = *pcounter - nobjects;
+        
+        rw_assert (0 == nobjects, 0, line,
+                   "line %d. %s constucted %zu objects, expected %zu",
+                   __LINE__, fname, nobjects, nelems);
+    }
+
+    // verify the element values
+    for (std::size_t i = 0; i != nelems; ++i) {
+        if (!rw_assert (lhs_va [i] == res_array [i], 0, line,
+                        "line %d. %s: element at index %zu == %d, got %d",
+                        __LINE__, fname, i, value (res_array [i]),
+                        value (lhs_va [i])))
+            break;
+
+    }
+
+    delete_array (lhs_array, nelems);
+    delete_array (rhs_array, nelems);
+
+    std::free (fname);
+}
+
+
+/**************************************************************************/
+
+#define OP(lhs, rhs, res) \
+    test_op_assign ((T*)0, op, tname, opname, __LINE__, lhs, rhs, res)
+
+
+template <class T>
+void test_mul_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator*=;
+
+    OP ("", "", "");
+
+    OP ("0", "0", "0");
+    OP ("0", "1", "0");
+    OP ("1", "0", "0");
+    OP ("1", "1", "1");
+    OP ("1", "2", "2");
+
+    OP ("1,2", "1,1", "1,2");
+    OP ("1,2", "1,2", "1,4");
+    OP ("2,3", "4,5", "8,15");
+    OP ("3,4", "5,6", "15,24");
+
+    OP ("1,2,3",    "4,5,6",    "4,10,18");
+    OP ("-1,-2,-3", "-4,-5,-6", "4,10,18");
+    OP ("1,-2,3",   "-4,5,-6",  "-4,-10,-18");
+}
+
+/**************************************************************************/
+
+template <class T>
+void test_div_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator/=;
+
+    OP ("", "", "");
+
+    OP ("0", "1", "0");
+    OP ("1", "1", "1");
+    OP ("2", "1", "2");
+    OP ("2", "2", "1");
+    OP ("3", "1", "3");
+    OP ("3", "2", "1.5");
+    OP ("4", "2", "2");
+
+    OP ("0,1,2,3,4,5,6,7",     "1,1,1,1,1,1,1,1", "0,1,2,3,4,5,6,7");
+    OP ("2,4,6,8,10,12,14,16", "2,2,2,2,2,2,2,2", "1,2,3,4,5,6,7,8");
+    OP ("2,4,6,8,10,12,14,16", "2,2,2,2,2,2,2,2", "1,2,3,4,5,6,7,8");
+
+    OP ("0@127", "1@127", "0@127");
+    OP ("1@128", "1@128", "1@128");
+    OP ("2@255", "1@255", "2@255");
+    OP ("2@256", "2@256", "1@256");
+    OP ("3@256", "1@256", "3@256");
+    OP ("3@511", "2@511", "1.5@511");
+    OP ("4@512", "2@512", "2@512");
+}
+
+/**************************************************************************/
+
+template <class T>
+void test_mod_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator%=;
+
+    OP ("", "", "");
+
+    OP ("0", "1", "0");
+    OP ("1", "1", "0");
+    OP ("2", "1", "0");
+    OP ("2", "2", "0");
+    OP ("3", "1", "0");
+    OP ("3", "2", "1");
+    OP ("3", "3", "0");
+    OP ("4", "1", "0");
+    OP ("4", "2", "0");
+    OP ("4", "3", "1");
+    OP ("4", "4", "0");
+
+    OP ("0,1",     "2,2",     "0,1");
+    OP ("1,2,3",   "4,4,4",   "1,2,3");
+    OP ("2,3,4,5", "6,6,6,6", "2,3,4,5");
+
+    OP ("0,1,2,3,4,5,6,7,8,9", "10,9,8,7,6,5,4,3,2,1", "0,1,2,3,4,0,2,1,0,0");
+}
+
+#define CANNOT_TEST(T, name) \
+    void test_##name (const T*, const char*, const char*) { } \
+    typedef void swallow_semicolon
+
+
+CANNOT_TEST (float, mod_assign);
+CANNOT_TEST (double, mod_assign);
+CANNOT_TEST (UserClass, mod_assign);
+
+/**************************************************************************/
+
+template <class T>
+void test_add_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator+=;
+
+    OP ("", "", "");
+
+    OP ("0",  "0", "0");
+    OP ("0",  "1", "1");
+    OP ("1",  "0", "1");
+    OP ("1", "-1", "0");
+    OP ("-1", "1", "0");
+
+    OP ("0@31",  "0@31", "0@31");
+    OP ("0@31",  "1@31", "1@31");
+    OP ("1@31",  "0@31", "1@31");
+    OP ("1@31", "-1@31", "0@31");
+    OP ("-1@31", "1@31", "0@31");
+
+    OP ("2@32",  "3@32", "5@32");
+    OP ("3@32",  "5@32", "8@32");
+    OP ("5@32",  "7@32", "12@32");
+    OP ("9@32", "-9@32", "0@32");
+
+    OP ("0@63",  "0@63", "0@63");
+    OP ("0@63",  "1@63", "1@63");
+    OP ("1@63",  "0@63", "1@63");
+    OP ("1@63", "-1@63", "0@63");
+    OP ("-1@63", "1@63", "0@63");
+
+    OP ("0@63",  "0@63", "0@63");
+    OP ("0@63",  "1@63", "1@63");
+    OP ("1@63",  "0@63", "1@63");
+    OP ("1@63", "-1@63", "0@63");
+    OP ("-1@63", "1@63", "0@63");
+
+    OP ("0,0", "0,0", "0,0");
+    OP ("0,0", "0,1", "0,1");
+    OP ("0,0", "1,0", "1,0");
+    OP ("0,0", "1,1", "1,1");
+    OP ("0,1", "0,1", "0,2");
+    OP ("0,1", "1,0", "1,1");
+    OP ("0,1", "1,1", "1,2");
+    OP ("1,0", "0,0", "1,0");
+    OP ("1,0", "0,1", "1,1");
+    OP ("1,0", "1,0", "2,0");
+    OP ("1,0", "1,1", "2,1");
+    OP ("1,1", "0,0", "1,1");
+    OP ("1,1", "0,1", "1,2");
+    OP ("1,1", "1,0", "2,1");
+    OP ("1,1", "1,1", "2,2");
+}
+
+/**************************************************************************/
+
+template <class T>
+void test_sub_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator-=;
+
+    OP ("", "", "");
+
+    OP (" 0", " 0", " 0");
+    OP (" 0", "+1", "-1");
+    OP ("+1", " 0", "+1");
+    OP ("+1", "-1", "+2");
+    OP ("-1", "+1", "-2");
+
+    OP (" 0@12", " 0@12", " 0@12");
+    OP (" 0@23", "+1@23", "-1@23");
+    OP ("+1@34", " 0@34", "+1@34");
+    OP ("+1@45", "-1@45", "+2@45");
+    OP ("-1@56", "+1@56", "-2@56");
+}
+
+/**************************************************************************/
+
+template <class T>
+void test_xor_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator^=;
+
+    OP ("", "", "");
+
+    OP ("0", "0", "0");
+    OP ("0", "1", "1");
+    OP ("1", "0", "1");
+    OP ("1", "1", "0");
+    OP ("3", "0", "3");
+    OP ("3", "1", "2"); 
+    OP ("3", "2", "1");
+    OP ("3", "3", "0");
+
+    OP ("0@10", "0@10", "0@10");
+    OP ("0@11", "1@11", "1@11");
+    OP ("1@12", "0@12", "1@12");
+    OP ("1@13", "1@13", "0@13");
+    OP ("3@14", "0@14", "3@14");
+    OP ("3@15", "1@15", "2@15"); 
+    OP ("3@16", "2@16", "1@16");
+    OP ("3@17", "3@17", "0@17");
+}
+
+CANNOT_TEST (float, xor_assign);
+CANNOT_TEST (double, xor_assign);
+CANNOT_TEST (UserClass, xor_assign);
+
+/**************************************************************************/
+
+template <class T>
+void test_and_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator&=;
+
+    OP ("", "", "");
+
+    OP ("0", "0", "0");
+    OP ("0", "1", "0");
+    OP ("1", "0", "0");
+    OP ("1", "1", "1");
+    OP ("3", "0", "0");
+    OP ("3", "1", "1"); 
+    OP ("3", "2", "2");
+    OP ("3", "3", "3");
+
+    OP ("0@10", "0@10", "0@10");
+    OP ("0@11", "1@11", "0@11");
+    OP ("1@12", "0@12", "0@12");
+    OP ("1@13", "1@13", "1@13");
+    OP ("3@14", "0@14", "0@14");
+    OP ("3@15", "1@15", "1@15"); 
+    OP ("3@16", "2@16", "2@16");
+    OP ("3@17", "3@17", "3@17");
+}
+
+CANNOT_TEST (float, and_assign);
+CANNOT_TEST (double, and_assign);
+CANNOT_TEST (UserClass, and_assign);
+
+/**************************************************************************/
+
+template <class T>
+void test_or_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator|=;
+
+    OP ("", "", "");
+
+    OP ("0", "0", "0");
+    OP ("0", "1", "1");
+    OP ("1", "0", "1");
+    OP ("1", "1", "1");
+    OP ("3", "0", "3");
+    OP ("3", "1", "3"); 
+    OP ("3", "2", "3");
+    OP ("3", "3", "3");
+
+    OP ("0@10", "0@10", "0@10");
+    OP ("0@11", "1@11", "1@11");
+    OP ("1@12", "0@12", "1@12");
+    OP ("1@13", "1@13", "1@13");
+    OP ("3@14", "0@14", "3@14");
+    OP ("3@15", "1@15", "3@15"); 
+    OP ("3@16", "2@16", "3@16");
+    OP ("3@17", "3@17", "3@17");
+}
+
+CANNOT_TEST (float, or_assign);
+CANNOT_TEST (double, or_assign);
+CANNOT_TEST (UserClass, or_assign);
+
+/**************************************************************************/
+
+template <class T>
+void test_shl_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator<<=;
+
+    OP ("", "", "");
+
+    OP ("0", "0", "0");
+    OP ("0", "1", "0");
+    OP ("1", "0", "1");
+    OP ("1", "1", "2");
+    OP ("3", "0", "3");
+    OP ("3", "1", "6"); 
+    OP ("3", "2", "12");
+    OP ("3", "3", "24");
+
+    OP ("0@10", "0@10", "0@10");
+    OP ("0@11", "1@11", "0@11");
+    OP ("1@12", "0@12", "1@12");
+    OP ("1@13", "1@13", "2@13");
+    OP ("3@14", "0@14", "3@14");
+    OP ("3@15", "1@15", "6@15"); 
+    OP ("3@16", "2@16", "12@16");
+    OP ("3@17", "3@17", "24@17");
+}
+
+CANNOT_TEST (float, shl_assign);
+CANNOT_TEST (double, shl_assign);
+CANNOT_TEST (UserClass, shl_assign);
+
+/**************************************************************************/
+
+template <class T>
+void test_shr_assign (const T*, const char *tname, const char *opname)
+{
+    rw_info (0, 0, __LINE__,
+             "std::valarray<%s>::operator%s (const std::valarray<%1$s>&)",
+             tname, opname);
+
+    std::valarray<T>& (std::valarray<T>::*op)(const std::valarray<T>&) =
+        &std::valarray<T>::operator>>=;
+
+    OP ("", "", "");
+
+    OP ("0",  "0", "0");
+    OP ("0",  "1", "0");
+    OP ("1",  "0", "1");
+    OP ("2",  "1", "1");
+    OP ("3",  "0", "3");
+    OP ("6",  "1", "3"); 
+    OP ("12", "2", "3");
+    OP ("24", "3", "3");
+
+    OP ("0@21",  "0@21", "0@21");
+    OP ("0@21",  "1@21", "0@21");
+    OP ("1@21",  "0@21", "1@21");
+    OP ("2@21",  "1@21", "1@21");
+    OP ("3@21",  "0@21", "3@21");
+    OP ("6@21",  "1@21", "3@21"); 
+    OP ("12@21", "2@21", "3@21");
+    OP ("24@21", "3@21", "3@21");
+}
+
+CANNOT_TEST (float, shr_assign);
+CANNOT_TEST (double, shr_assign);
+CANNOT_TEST (UserClass, shr_assign);
+
+/**************************************************************************/
+
+enum {
+    inx_mul_assign,
+    inx_div_assign,
+    inx_mod_assign,
+    inx_add_assign,
+    inx_sub_assign,
+    inx_xor_assign,
+    inx_and_assign,
+    inx_or_assign,
+    inx_shl_assign,
+    inx_shr_assign,
+    n_assign_ops
+};
+
+static int opt_assign [n_assign_ops];
+
+
+template <class T>
+void test_op_assign (const T*, const char *tname)
+{
+    const std::size_t nassigns = sizeof opt_assign / sizeof *opt_assign;
+    for (std::size_t i = 0; i != nassigns; ++i) {
+        if (0 < opt_assign [i]) {
+            for (std::size_t j = 0; j != nassigns; ++j) {
+                if (0 == opt_assign [j])
+                    opt_assign [j] = -1;
+            }
+            break;
+        }
+    }
+
+    if (rw_note (0 <= opt_assign [inx_mul_assign], 0, __LINE__,
+                 "tests of operator*= disabled"))
+        test_mul_assign ((const T*)0, tname, "*=");
+
+    if (rw_note (0 <= opt_assign [inx_div_assign], 0, __LINE__,
+                 "tests of operator/= disabled"))
+        test_div_assign ((const T*)0, tname, "/=");
+
+    if (rw_note (0 <= opt_assign [inx_mod_assign], 0, __LINE__,
+                 "tests of operator%= disabled"))
+        test_mod_assign ((const T*)0, tname, "%=");
+
+    if (rw_note (0 <= opt_assign [inx_add_assign], 0, __LINE__,
+                 "tests of operator+= disabled"))
+        test_add_assign ((const T*)0, tname, "+=");
+
+    if (rw_note (0 <= opt_assign [inx_sub_assign], 0, __LINE__,
+                 "tests of operator-= disabled"))
+        test_sub_assign ((const T*)0, tname, "-=");
+
+    if (rw_note (0 <= opt_assign [inx_xor_assign], 0, __LINE__,
+                 "tests of operator^= disabled"))
+        test_xor_assign ((const T*)0, tname, "^=");
+
+    if (rw_note (0 <= opt_assign [inx_and_assign], 0, __LINE__,
+                 "tests of operator&= disabled"))
+        test_and_assign ((const T*)0, tname, "&=");
+
+    if (rw_note (0 <= opt_assign [inx_or_assign], 0, __LINE__,
+                 "tests of operator|= disabled"))
+        test_or_assign ((const T*)0, tname, "|=");
+
+    if (rw_note (0 <= opt_assign [inx_shl_assign], 0, __LINE__,
+                 "tests of operator<<= disabled"))
+        test_shr_assign ((const T*)0, tname, "<<=");
+
+    if (rw_note (0 <= opt_assign [inx_shr_assign], 0, __LINE__,
+                 "tests of operator>>= disabled"))
+        test_shr_assign ((const T*)0, tname, ">>=");
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+#undef TEST
+#define TEST(T)   test_op_assign ((const T*)0, #T)
+    TEST (int);
+    TEST (double);
+
+    TEST (UserClass);
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    // FIXME: add command line options to enable/disable each operator
+    return rw_test (argc, argv, __FILE__,
+                    "valarray.cassign",
+                    0 /* no comment */,
+                    run_test,
+                    "|-times~ "
+                    "|-divide~ "
+                    "|-modulo~ "
+                    "|-plus~ "
+                    "|-minus~ "
+                    "|-xor~ "
+                    "|-and~ "
+                    "|-or~ "
+                    "|-shift_left~ "
+                    "|-shift_right~",
+                    opt_assign + inx_mul_assign,
+                    opt_assign + inx_div_assign,
+                    opt_assign + inx_mod_assign,
+                    opt_assign + inx_add_assign,
+                    opt_assign + inx_sub_assign,
+                    opt_assign + inx_xor_assign,
+                    opt_assign + inx_and_assign,
+                    opt_assign + inx_or_assign,
+                    opt_assign + inx_shl_assign,
+                    opt_assign + inx_shr_assign,
+                    (void*)0   /* sentinel */);
+}
diff --git a/tests/regress/18.limits.stdcxx-436.cpp b/tests/regress/18.limits.stdcxx-436.cpp
new file mode 100644
index 0000000..ada1f9f
--- /dev/null
+++ b/tests/regress/18.limits.stdcxx-436.cpp
@@ -0,0 +1,61 @@
+/************************************************************************
+ *
+ * 18.limits.stdcxx-436.cpp - test case from STDCXX-436 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <assert.h>  // for assert()
+#include <limits.h>  // for MB_LEN_MAX
+
+// tell Compaq C++ we need the declaration of the POSIX popen() function
+// that's guarded (not declared) in the compiler's pure C++ libc headers
+#undef __PURE_CNAME
+#include <stdio.h>   // for popen(), fscanf(), pclose(), ...
+
+#if defined(_WIN32) || defined(_WIN64)
+#  define popen  _popen
+#  define pclose _pclose
+#endif  // defined(_WIN32) || defined(_WIN64)
+
+int main ()
+{
+    // assumes getconf is in the path. on most unix systems it is in
+    // '/usr/bin' and it doesn't exist on most win32 configurations,
+    // yet somehow this appears to work on windows, but not sure how.
+
+    FILE* f = popen ("getconf MB_LEN_MAX", "r");
+    if (f) {
+
+        int mb_len_max = -1;
+
+        const bool failed = fscanf (f, "%d", &mb_len_max) != 1;
+
+        pclose (f);
+
+        // if getconf isn't available, or getconf doesn't know the limit
+        // the scan will fail, so we must handle both situations.
+        assert (failed || MB_LEN_MAX == mb_len_max);
+    }
+
+    return 0;
+}
diff --git a/tests/regress/20.specialized.stdcxx-390.cpp b/tests/regress/20.specialized.stdcxx-390.cpp
new file mode 100644
index 0000000..a33b0e4
--- /dev/null
+++ b/tests/regress/20.specialized.stdcxx-390.cpp
@@ -0,0 +1,49 @@
+/**************************************************************************
+ *
+ * 20.specialized.stdcxx-390.cpp - regression test for STDCXX-390
+ *
+ * http://issues.apache.org/jira/browse/STDCXX-390
+ *
+ * $Id$
+ *
+ **************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <memory>
+
+int main ()
+{
+    int i = 0;
+    const int ci = 0;
+    volatile int vi = 0;
+    const volatile int cvi = 0;
+
+    std::uninitialized_copy (&i, &i, &i);
+    std::uninitialized_copy (&i, &i, &vi);
+
+    std::uninitialized_copy (&ci, &ci, &i);
+    std::uninitialized_copy (&ci, &ci, &vi);
+
+    std::uninitialized_copy (&vi, &vi, &i);
+    std::uninitialized_copy (&vi, &vi, &vi);
+
+    std::uninitialized_copy (&cvi, &cvi, &i);
+    std::uninitialized_copy (&cvi, &cvi, &vi);
+}
diff --git a/tests/regress/21.string.replace.stdcxx-175.cpp b/tests/regress/21.string.replace.stdcxx-175.cpp
new file mode 100644
index 0000000..505bf39
--- /dev/null
+++ b/tests/regress/21.string.replace.stdcxx-175.cpp
@@ -0,0 +1,45 @@
+/************************************************************************
+*
+* 21.string.replace.stdcxx-175.cpp - test case from STDCXX-175 issue
+*
+* $Id$
+*
+***************************************************************************
+*
+* Licensed to the Apache Software  Foundation (ASF) under one or more
+* contributor  license agreements.  See  the NOTICE  file distributed
+* with  this  work  for  additional information  regarding  copyright
+* ownership.   The ASF  licenses this  file to  you under  the Apache
+* License, Version  2.0 (the  "License"); you may  not use  this file
+* except in  compliance with the License.   You may obtain  a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the  License is distributed on an  "AS IS" BASIS,
+* WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+* implied.   See  the License  for  the  specific language  governing
+* permissions and limitations under the License.
+*
+**************************************************************************/
+
+#include <cassert>
+#include <string>
+#include <stdexcept>
+
+int main (int argc, char* argv [])
+{
+    std::string s (4095, 'a');
+
+    try 
+    {
+        s.replace (0, 1, "a", s.max_size () + 1);
+        assert (!"Expect length error, got nothing");
+    }
+    catch (std::length_error& e)
+    {
+    }
+
+    return 0;
+}
diff --git a/tests/regress/21.string.stdcxx-162.cpp b/tests/regress/21.string.stdcxx-162.cpp
new file mode 100644
index 0000000..0beedc6
--- /dev/null
+++ b/tests/regress/21.string.stdcxx-162.cpp
@@ -0,0 +1,72 @@
+/************************************************************************
+*
+* 21.string.stdcxx-175.cpp - regression test for STDCXX-162
+*
+* https://issues.apache.org/jira/browse/STDCXX-162
+*
+* $Id$
+*
+***************************************************************************
+*
+* Licensed to the Apache Software  Foundation (ASF) under one or more
+* contributor  license agreements.  See  the NOTICE  file distributed
+* with  this  work  for  additional information  regarding  copyright
+* ownership.   The ASF  licenses this  file to  you under  the Apache
+* License, Version  2.0 (the  "License"); you may  not use  this file
+* except in  compliance with the License.   You may obtain  a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the  License is distributed on an  "AS IS" BASIS,
+* WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+* implied.   See  the License  for  the  specific language  governing
+* permissions and limitations under the License.
+*
+**************************************************************************/
+
+#include <cassert>
+#include <string>
+
+#ifdef _RWSTD_POSIX_THREADS
+#  include <pthread.h>
+#  define MUTEX   pthread_mutex_t
+#elif _RWSTD_SOLARIS_THREADS
+#  include <thread.h>
+#  define MUTEX   thr_mutex_t
+#endif   // _RWSTD_POSIX_THREADS
+
+int main ()
+{
+    typedef std::char_traits<char> Traits;
+    typedef std::allocator<char> Allocator;
+    typedef __rw::__string_ref<char, Traits, Allocator> strref;
+
+    struct SmallRef {
+        int ref_count;
+        std::string::size_type capacity;
+        std::string::size_type size;
+    };
+
+    // verify that the reference-counted string body isn't bigger
+    // than the struct above
+    assert (sizeof (strref) <= sizeof (SmallRef));
+
+#ifdef MUTEX
+
+    struct LargeRef {
+        MUTEX                  mutex;
+        int                    ref_count;
+        std::string::size_type capacity;
+        std::string::size_type size;
+    };
+
+    // verify that the reference-counted string body is smaller
+    // than the struct containing a full-blown mutex object above
+    assert (sizeof (strref) < sizeof (LargeRef));
+
+#endif   // MUTEX
+
+    return 0;
+}
diff --git a/tests/regress/21.string.stdcxx-466.cpp b/tests/regress/21.string.stdcxx-466.cpp
new file mode 100644
index 0000000..19683a8
--- /dev/null
+++ b/tests/regress/21.string.stdcxx-466.cpp
@@ -0,0 +1,60 @@
+/************************************************************************
+ *
+ * 21.string.stdcxx-466.cpp - test case from STDCXX-466 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <cassert>
+#include <string>
+
+int main (int argc, char* argv[])
+{
+    std::string s ("efgh");
+
+    const std::string::size_type len = s.max_size () + 1;
+
+#define TEST(expr)                                      \
+    try {                                               \
+        assert (expr);                                  \
+    }                                                   \
+    catch (...) {                                       \
+        assert (!"Unexpected exception was thrown");    \
+    } (void)0
+
+    const std::string::size_type npos = std::string::npos;
+
+    TEST (npos == s.find ("fg", 0, len));
+    TEST (npos == s.rfind ("fg", 0, len));
+    TEST (0 == s.find_first_of ("eh", 0, len));
+    TEST (3 == s.find_last_of ("eh", npos, len));
+    TEST (0 > s.compare (0, npos, "efgh", len));
+    TEST (0 > s.compare (0, npos, "ijkl", len));
+    TEST (0 < s.compare (0, npos, "abcd", len));
+
+    s.clear ();
+
+    TEST (npos == s.find_first_not_of ("eh", 0, len));
+    TEST (npos == s.find_last_not_of ("eh", npos, len));
+
+    return 0;
+}
diff --git a/tests/regress/22.locale.cons.stdcxx-485.cpp b/tests/regress/22.locale.cons.stdcxx-485.cpp
new file mode 100644
index 0000000..bb6ee0a
--- /dev/null
+++ b/tests/regress/22.locale.cons.stdcxx-485.cpp
@@ -0,0 +1,84 @@
+/************************************************************************
+ *
+ * 22.locale.cons.stdcxx-485.cpp
+ *
+ * test exercising the thread safety of locale ctors
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <cassert>
+#include <cstring>
+#include <locale>
+
+#include <rw_locale.h>
+#include <driver.h>
+
+
+static int
+run_test (int, char**)
+{
+    // obtain a NUL-separated list of installed locales
+    const char* const names = rw_locales ();
+
+    if (0 == names || '\0' == *names)
+        return 0;
+
+    // repeatedly create a large set of unique named locale objects
+    for (int j = 0; j != 2; ++j) {
+        std::locale locales [64];
+
+        std::size_t i = 0;
+
+        for (const char *pn = names; *pn; ++i, pn += std::strlen (pn) + 1) {
+            if (i == sizeof locales / sizeof *locales)
+                break;
+
+            locales [i] = std::locale (pn);
+        }
+
+        i = 0;
+
+        for (const char *pn = names; *pn; ++i, pn += std::strlen (pn) + 1) {
+            if (i == sizeof locales / sizeof *locales)
+                break;
+
+            rw_assert (std::has_facet<std::collate<char> >(locales [i]),
+                       0, __LINE__,
+                       "std::has_facet<std::collate<char> >(locales(#s))",
+                       pn);
+        }
+    }
+
+    return 0;
+}
+
+
+int main (int argc, char* argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.cons",
+                    "STDCXX-485",
+                    run_test,
+                    "",
+                    (void*)0);
+}
diff --git a/tests/regress/22.locale.messages.stdcxx-542.cpp b/tests/regress/22.locale.messages.stdcxx-542.cpp
new file mode 100644
index 0000000..ff428c5
--- /dev/null
+++ b/tests/regress/22.locale.messages.stdcxx-542.cpp
@@ -0,0 +1,99 @@
+/************************************************************************
+ *
+ * 22.locale.messages.stdcxx-508_542.cpp
+ *
+ * the regression test for STDCXX-508, STDCXX-542 issues
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <cstdio>
+#include <cassert>
+#include <locale>
+
+#include <rw_locale.h>
+#include <driver.h>
+
+#ifdef _MSC_VER
+#include <crtdbg.h>
+#endif
+
+#ifdef _WIN32
+#  define CATALOG "test"
+#  define MSG_EXT ".rc"
+#  define CAT_EXT ".dll"
+#else
+#  define CATALOG "./test"
+#  define MSG_EXT ".msg"
+#  define CAT_EXT ".cat"
+#endif
+
+
+static int run_test (int, char**)
+{
+    const char * catalog =
+        "First set, first message\0\0"
+        "Second set, first message\0\0";
+
+    rw_create_catalog (CATALOG MSG_EXT, catalog);
+    
+    typedef std::messages<char> messagesT;
+
+    const std::locale loc;
+
+    const messagesT& msgs =
+        std::use_facet<messagesT>(loc);
+
+    messagesT::catalog cats [4];
+
+    int i;
+
+    // test STDCXX-508
+    for (i = 0; i < sizeof (cats) / sizeof (*cats); ++i) {
+        cats [i] = msgs.open (CATALOG CAT_EXT, loc);
+        assert (-1 != cats [i]);
+    }
+    
+    // test STDCXX-542
+    for (--i; i >= 0; --i)
+        msgs.close (cats [i]);
+
+    std::remove (CATALOG CAT_EXT);
+    
+    return 0;
+}
+
+
+int main (int argc, char* argv[])
+{
+#ifdef _MSC_VER
+    // disable GUI window from abort()
+    _CrtSetReportMode (_CRT_ERROR, _CRTDBG_MODE_DEBUG);
+#endif
+
+    return rw_test (argc, argv, __FILE__,
+                    "lib.locale.messages",
+                    "STDCXX-508;STDCXX-542",
+                    run_test,
+                    "",
+                    (void*)0);
+}
diff --git a/tests/regress/22.locale.stdcxx-554.cpp b/tests/regress/22.locale.stdcxx-554.cpp
new file mode 100644
index 0000000..13b3d4e
--- /dev/null
+++ b/tests/regress/22.locale.stdcxx-554.cpp
@@ -0,0 +1,77 @@
+/************************************************************************
+ *
+ * 22.locale.stdcxx-554.cpp - the regression test for STDCXX-554 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <cstring>   // for memset()
+#include <cassert>   // for assert()
+
+#include <locale>    // for std::moneypunct, std::messages
+
+template <class charT>
+void test_moneypunct (charT)
+{
+    typedef std::moneypunct <charT> PunctT;
+
+    const char fill = '\xdc';
+
+    char buf [sizeof (PunctT) + 1];
+    std::memset (buf, fill, sizeof (buf));
+
+    PunctT* p = new (buf) PunctT ();
+
+    assert (fill == buf [sizeof (PunctT)]);
+
+    p->~PunctT ();
+}
+
+template <class charT>
+void test_messages (charT)
+{
+    typedef std::messages <charT> MessagesT;
+
+    const char fill = '\xdc';
+
+    char buf [sizeof (MessagesT) + 1];
+    std::memset (buf, fill, sizeof (buf));
+
+    MessagesT* p = new (buf) MessagesT ();
+
+    assert (fill == buf [sizeof (MessagesT)]);
+
+    p->~MessagesT ();
+}
+
+int main (int, char* [])
+{
+    test_moneypunct (char ());
+    test_messages (char ());
+
+#ifndef _RWSTD_NO_WCHAR_T
+    test_moneypunct (wchar_t ());
+    test_messages (wchar_t ());
+#endif
+
+    return 0;
+}
diff --git a/tests/regress/23.associative.stdcxx-16.cpp b/tests/regress/23.associative.stdcxx-16.cpp
new file mode 100644
index 0000000..3f85366
--- /dev/null
+++ b/tests/regress/23.associative.stdcxx-16.cpp
@@ -0,0 +1,70 @@
+/************************************************************************
+ *
+ * 23.associative.stdcxx-16.cpp - regression test for STDCXX-16
+ *   http://issues.apache.org/jira/browse/STDCXX-16
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <set>
+#include <map>
+#include <cassert>
+
+template <class T>
+struct RuntimeCmp
+{
+    enum cmp_mode {normal, reverse};
+
+    cmp_mode mode;
+
+    RuntimeCmp (cmp_mode m = normal) : mode (m) { }
+
+    bool operator() (const T& t1, const T& t2) const {
+        return mode == normal ? t1 < t2 : t2 < t1;
+    }
+};
+
+template <class T>
+bool operator== (const RuntimeCmp <T>& lc, const RuntimeCmp <T>& rc) {
+    return lc.mode == rc.mode;
+}
+
+typedef std::set <int, RuntimeCmp <int> > IntSet;
+typedef std::map <int, int, RuntimeCmp <int> > IntMap;
+
+int main ()
+{
+    RuntimeCmp <int> reverse_order (RuntimeCmp<int>::reverse);
+
+    IntSet set1;
+    IntSet set2 (reverse_order);
+    set1 = set2;
+    assert (set1.key_comp () == set2.key_comp ());
+    assert (set1.value_comp () == set2.value_comp ());
+
+    IntMap map1;
+    IntMap map2 (reverse_order);
+    map1 = map2;
+    assert (map1.key_comp () == map2.key_comp ());
+
+    return 0;
+}
diff --git a/tests/regress/23.vector.bool.stdcxx-235.cpp b/tests/regress/23.vector.bool.stdcxx-235.cpp
new file mode 100644
index 0000000..812e7b1
--- /dev/null
+++ b/tests/regress/23.vector.bool.stdcxx-235.cpp
@@ -0,0 +1,59 @@
+/************************************************************************
+*
+* 23.vector.bool.stdcxx-235.cpp - regression test for STDCXX-235
+*
+* https://issues.apache.org/jira/browse/STDCXX-235
+*
+* $Id$
+*
+***************************************************************************
+*
+* Licensed to the Apache Software  Foundation (ASF) under one or more
+* contributor  license agreements.  See  the NOTICE  file distributed
+* with  this  work  for  additional information  regarding  copyright
+* ownership.   The ASF  licenses this  file to  you under  the Apache
+* License, Version  2.0 (the  "License"); you may  not use  this file
+* except in  compliance with the License.   You may obtain  a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the  License is distributed on an  "AS IS" BASIS,
+* WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+* implied.   See  the License  for  the  specific language  governing
+* permissions and limitations under the License.
+*
+**************************************************************************/
+
+#include <cassert>
+#include <vector>
+
+int main ()
+{
+    std::vector<bool> v;
+
+    typedef std::vector<bool>::const_iterator const_iterator;
+    typedef std::vector<bool>::iterator       iterator;
+
+    const const_iterator cbegin = v.begin ();
+    const iterator       begin  = v.begin ();
+
+    assert (cbegin == begin);
+    assert (begin  == cbegin);
+
+    assert (!(cbegin == begin));
+    assert (!(begin  == cbegin));
+
+    assert (cbegin <= begin);
+    assert (begin  <= cbegin);
+
+    assert (cbegin >= begin);
+    assert (begin  >= cbegin);
+
+    assert (!(cbegin < begin));
+    assert (!(begin  < cbegin));
+
+    assert (!(cbegin > begin));
+    assert (!(begin  > cbegin));
+}
diff --git a/tests/regress/24.operations.stdcxx-234.cpp b/tests/regress/24.operations.stdcxx-234.cpp
new file mode 100644
index 0000000..c6a051e
--- /dev/null
+++ b/tests/regress/24.operations.stdcxx-234.cpp
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *
+ * 24.operations.stdcxx-234 - regression test for STDCXX-234
+ *   http://issues.apache.org/jira/browse/STDCXX-234
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2007 Rogue Wave Software, Inc.
+ *
+ **************************************************************************/
+
+#include <iterator>
+
+struct X: std::iterator<std::random_access_iterator_tag, int> { };
+
+namespace std {
+
+// specialize the std::distance() function template of a user-defined
+// iterator type to verify that the signature of the primary template
+// is the same as the one of the specialization
+template <> std::iterator_traits<X>::difference_type
+distance<X> (X, X) { return 0; }
+
+} // namespace std
+
+int main ()
+{
+    return std::distance (X (), X ());
+}
diff --git a/tests/regress/26.valarray.binary.stdcxx-237.cpp b/tests/regress/26.valarray.binary.stdcxx-237.cpp
new file mode 100644
index 0000000..055217b
--- /dev/null
+++ b/tests/regress/26.valarray.binary.stdcxx-237.cpp
@@ -0,0 +1,42 @@
+/************************************************************************
+ *
+ * 26.valarray.binary.stdcxx-237.cpp - regression test for STDCXX-237
+ *
+ *   http://issues.apache.org/jira/browse/STDCXX-237
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cassert>
+#include <valarray>
+
+int main()
+{
+    std::valarray<int> ia;
+    std::gslice        gs;
+
+    std::valarray<int> res = std::operator%<int>(ia [gs], ia [gs]);
+
+    assert (0 == res.size ());
+
+    return 0;
+} 
diff --git a/tests/regress/26.valarray.sub.stdcxx-309.cpp b/tests/regress/26.valarray.sub.stdcxx-309.cpp
new file mode 100644
index 0000000..a08d023
--- /dev/null
+++ b/tests/regress/26.valarray.sub.stdcxx-309.cpp
@@ -0,0 +1,51 @@
+/************************************************************************
+ *
+ * 26.valarray.sub.stdcxx-309.cpp - regression test for STDCXX-309
+ *
+ *   https://issues.apache.org/jira/browse/STDCXX-309
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cassert>
+#include <cstddef>
+#include <valarray>
+
+int main ()
+{
+    const int a[] = { 1, 2, 3, 4, 5, 6 };
+
+    const std::valarray<int> v (a, sizeof a / sizeof *a);
+
+    const std::size_t start = 5;
+    std::valarray<std::size_t> length (1, 1);
+    std::valarray<std::size_t> stride (1, 1);
+
+    const std::gslice gsl (start, length, stride);
+
+    for (int i = 0; i != 2; ++i) {
+        const std::valarray<int> vsl = v [gsl];
+        assert (a [start] == vsl [0]);
+    }
+
+    return 0;
+} 
diff --git a/tests/regress/26.valarray.transcend.stdcxx-315.cpp b/tests/regress/26.valarray.transcend.stdcxx-315.cpp
new file mode 100644
index 0000000..7cd353e
--- /dev/null
+++ b/tests/regress/26.valarray.transcend.stdcxx-315.cpp
@@ -0,0 +1,102 @@
+/************************************************************************
+ *
+ * 26.valarray.transcend.stdcxx-315.cpp - regression test for STDCXX-315
+ *
+ *   http://issues.apache.org/jira/browse/STDCXX-315
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <new>
+#include <valarray>
+
+void* operator new (std::size_t s) throw (std::bad_alloc)
+{
+    return std::memset (std::malloc (s), 0x55, s);
+}
+
+bool pass = true;
+
+struct S {
+    const S* const self;
+    S (): self (this) { }
+    S (const S &s): self (this) { pass = pass && &s == s.self; }
+    S (double): self (this) { }
+    ~S () { pass = pass && this == self; }
+    operator double () const { pass = pass && this == self; return 1.0; }
+
+    void operator=(const S &s) const {
+        pass = pass && &s == s.self && this == self;
+    }
+    S operator- () const { pass = pass && this == self; return *this; }
+    bool operator< (const S &s) const {
+        pass = pass && &s == s.self && this == self;
+        return false;
+    }
+};
+
+
+int main ()
+{
+    const S s;
+    const std::valarray<S> a (2);
+
+    int nfails = 0;
+
+#define TEST(fun, args) \
+    pass = true; \
+    fun args; \
+    if (!pass) { \
+        std::fprintf (stderr, "std::%s uses uninitialized storage\n", \
+                      #fun); \
+        ++nfails; \
+    } (void)0
+
+TEST (abs, (a));
+    TEST (acos, (a));
+    TEST (asin, (a));
+    TEST (atan, (a));
+    TEST (atan2, (a, a));
+    TEST (atan2, (a, s));
+    TEST (atan2, (s, a));
+    TEST (cos, (a));
+    TEST (cosh, (a));
+    TEST (exp, (a));
+    TEST (log, (a));
+    TEST (log10, (a));
+    TEST (pow, (a, a));
+    TEST (pow, (a, s));
+    TEST (pow, (s, a));
+    TEST (sin, (a));
+    TEST (sinh, (a));
+    TEST (sqrt, (a));
+    TEST (tan, (a));
+    TEST (tanh, (a));
+
+    assert (0 == nfails);
+
+    return 0;
+}
diff --git a/tests/regress/27.filebuf.virtuals.stdcxx-522.cpp b/tests/regress/27.filebuf.virtuals.stdcxx-522.cpp
new file mode 100644
index 0000000..d26f618
--- /dev/null
+++ b/tests/regress/27.filebuf.virtuals.stdcxx-522.cpp
@@ -0,0 +1,48 @@
+/************************************************************************
+*
+* 27.filebuf.virtuals.stdcxx-522.cpp - regression test for STDCXX-522
+*
+* http://issues.apache.org/jira/browse/STDCXX-522
+*
+* $Id$
+*
+***************************************************************************
+*
+* Licensed to the Apache Software  Foundation (ASF) under one or more
+* contributor  license agreements.  See  the NOTICE  file distributed
+* with  this  work  for  additional information  regarding  copyright
+* ownership.   The ASF  licenses this  file to  you under  the Apache
+* License, Version  2.0 (the  "License"); you may  not use  this file
+* except in  compliance with the License.   You may obtain  a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the  License is distributed on an  "AS IS" BASIS,
+* WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+* implied.   See  the License  for  the  specific language  governing
+* permissions and limitations under the License.
+*
+**************************************************************************/
+
+#include <cassert>
+#include <fstream>
+#include <ios>
+
+int main ()
+{
+    struct: std::filebuf {
+        int_type overflow (int_type c) {
+            return std::filebuf::overflow (c);
+        }
+    } buf;
+
+    buf.open ("file", std::ios::out);
+    buf.pubsetbuf (0, 0);
+    buf.overflow (std::filebuf::traits_type::eof ());
+    buf.close ();
+
+    std::ifstream in ("file");
+    assert (std::istream::traits_type::eof () == in.get ());
+}
diff --git a/tests/regress/27.stringbuf.str.stdcxx-514.cpp b/tests/regress/27.stringbuf.str.stdcxx-514.cpp
new file mode 100644
index 0000000..e429376
--- /dev/null
+++ b/tests/regress/27.stringbuf.str.stdcxx-514.cpp
@@ -0,0 +1,58 @@
+/************************************************************************
+ *
+ * 27.stringbuf.str.stdcxx-514.cpp - test case from STDCXX-514 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <sstream>  // for stringbuf
+#include <memory>   // for allocator
+
+#include <cassert>  // for assert()
+
+char extbuf [3];
+
+struct MyAlloc : std::allocator <char>
+{
+    pointer allocate (size_type __n, std::allocator<void>::const_pointer = 0) {
+        return new char [__n];
+    }
+
+    void deallocate (pointer __p, size_type)
+    {
+        assert (extbuf != __p);
+        delete [] __p;
+    }
+};
+
+int main ()
+{
+    std::basic_stringbuf <char, std::char_traits <char>, MyAlloc> sbuf;
+
+    sbuf.pubsetbuf (extbuf, sizeof (extbuf));
+
+    const char* str = "abcdef";
+    sbuf.str (str);
+    assert (sbuf.str () == str);
+
+    return 0;
+}
diff --git a/tests/regress/27.stringbuf.xsputn.stdcxx-515.cpp b/tests/regress/27.stringbuf.xsputn.stdcxx-515.cpp
new file mode 100644
index 0000000..e475307
--- /dev/null
+++ b/tests/regress/27.stringbuf.xsputn.stdcxx-515.cpp
@@ -0,0 +1,45 @@
+/************************************************************************
+ *
+ * 27.stringbuf.xsputn.stdcxx-515.cpp - test case from STDCXX-515 issue
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ * 
+ **************************************************************************/
+
+#include <sstream>  // for stringstream
+#include <string>   // for string
+#include <cassert>  // for assert()
+
+int main ()
+{
+    for (size_t i = 1; i <= 1024; ++i) {
+        std::stringstream strm;
+        std::string s (i, 'a');
+        strm << s;
+        strm.seekp (-1, std::ios::cur);
+        s.erase (0, 1);
+        strm << "bc";
+        s.append ("bc");
+        assert (strm.str () == s);
+    }
+
+    return 0;
+} 
diff --git a/tests/self/0.char.cpp b/tests/self/0.char.cpp
index fc1160b..9e61f7f 100644
--- a/tests/self/0.char.cpp
+++ b/tests/self/0.char.cpp
@@ -394,7 +394,7 @@
 
         rw_assert (cdst == ret, 0, __LINE__,
                    "rw_widen(char*, %{#s}%{?}, %zu%{;})",
-                   src, i < nsrc);
+                   src, i < nsrc, i);
 
         rw_assert (0 == memcmp (cdst, src, i) && '\0' == cdst [i],
                    0, __LINE__,
@@ -638,7 +638,7 @@
 
         rw_assert (cdst == ret, 0, __LINE__,
                    "rw_narrow(char*, %{#s}%{?}, %zu%{;})",
-                   src, i < nsrc);
+                   src, i < nsrc, i);
 
         rw_assert (0 == memcmp (cdst, src, i) && '\0' == cdst [i],
                    0, __LINE__,
diff --git a/tests/self/0.new.cpp b/tests/self/0.new.cpp
index 96a4562..12708c2 100644
--- a/tests/self/0.new.cpp
+++ b/tests/self/0.new.cpp
@@ -467,13 +467,14 @@
 
 int run_test (int, char**)
 {
-#define TEST(name)                                              \
+#ifndef _RWSTD_NO_REPLACEABLE_NEW_DELETE
+
+#  define TEST(name)                                            \
     if (rw_opt_no_ ## name)                                     \
         rw_note (0, 0, __LINE__, "%s test disabled", #name);    \
-else                                                            \
+    else                                                        \
         test_ ## name ()
 
-
     TEST (bad_alloc);
     TEST (mismatch);
     TEST (double_delete);
@@ -482,11 +483,22 @@
     TEST (leaks);
     TEST (stress);
 
+#else    // _RWSTD_NO_REPLACEABLE_NEW_DELETE
+
+    rw_note (0, 0, __LINE__, "Test disabled");
+
+#endif   // _RWSTD_NO_REPLACEABLE_NEW_DELETE
+
     return 0;
 }
 
 /**************************************************************************/
-
+/*
+void* operator new (size_t n) throw (std::bad_alloc)
+{
+    return 0;
+}
+*/
 int main (int argc, char** argv)
 {
     return rw_test (argc, argv, __FILE__,
diff --git a/tests/self/0.printf.cpp b/tests/self/0.printf.cpp
index f4bd0b8..35cc7d6 100644
--- a/tests/self/0.printf.cpp
+++ b/tests/self/0.printf.cpp
@@ -22,10 +22,14 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2005-2006 Rogue Wave Software.
+ * Copyright 2005-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
+// tell Compaq C++ we need ENOMEM (defined by POSIX
+// but not in the compiler's pure C++ libc headers)
+#undef __PURE_CNAME
+
 #include <rw_printf.h>
 #include <rw_process.h> // for rw_pid_t
 #include <environ.h>    // for rw_putenv()
@@ -126,9 +130,9 @@
         sprintf (fmt, "%s%c", pfx, spec);                               \
         char* const s0 = rw_sprintfa (fmt, a1, a2, a3);                 \
         char buf [256];                                                 \
-        /* variable below avoids warnings about controlling */          \
-        /* expression being constant */                                 \
-        const char* const expect_var = (expect);                        \
+        /* non-const variable below avoids warnings about */            \
+        /* controlling expression being constant */                     \
+        const char* /* const */ expect_var = (expect);                  \
         if (expect_var)                                                 \
             strcpy (buf, expect_var ? expect_var : "");                 \
         else                                                            \
@@ -763,7 +767,7 @@
     TEST ("%{#1S}", S ("a\0\0"),  0, 0, "\"a\\0\\0\"");
     TEST ("%{#1S}", S ("\0\0\0"), 0, 0, "\"\\0\\0\\0\"");
 
-#if 2 == _RWSTD_WCHAR_T_SIZE
+#if 2 == _RWSTD_WCHAR_SIZE
 
     TEST ("%{#2S}",  0,             0, 0, "(null)");
     TEST ("%{#2S}",  WS (""),       0, 0, "L\"\"");
@@ -777,7 +781,7 @@
     TEST ("%{#2S}",  WS ("a\0\0"),  0, 0, "L\"a\\0\\0\"");
     TEST ("%{#2S}",  WS ("\0\0\0"), 0, 0, "L\"\\0\\0\\0\"");
 
-#elif 4 == _RWSTD_WCHAR_T_SIZE
+#elif 4 == _RWSTD_WCHAR_SIZE
 
     TEST ("%{#4S}",  0,             0, 0, "(null)");
     TEST ("%{#4S}",  WS (""),       0, 0, "L\"\"");
@@ -791,7 +795,7 @@
     TEST ("%{#4S}",  WS ("a\0\0"),  0, 0, "L\"a\\0\\0\"");
     TEST ("%{#4S}",  WS ("\0\0\0"), 0, 0, "L\"\\0\\0\\0\"");
 
-#endif   // _RWSTD_WCHAR_T_SIZE
+#endif   // _RWSTD_WCHAR_SIZE
 
 }
 
@@ -2257,6 +2261,12 @@
 
     int count = 0;
 
+    errno = 0;
+    TEST ("%{#m}", 0, 0, 0, "E#0");
+
+    errno = 0;
+    TEST ("%{#*m}", 0, 0, 0, "E#0");
+
 #ifdef EDOM
 
     ++count;
diff --git a/tests/self/0.process.cpp b/tests/self/0.process.cpp
index 375dd1e..ab2f63e 100644
--- a/tests/self/0.process.cpp
+++ b/tests/self/0.process.cpp
@@ -25,8 +25,11 @@
 *
 **************************************************************************/
 
+// tell Compaq C++ we need POSIX errno constants that are otherwise
+// guarded (not defined) in the compiler's pure C++ libc headers
+#undef __PURE_CNAME
+#include <errno.h>          // for ENOENT, ECHILD, ESRCH, errno
 #include <string.h>         // for strcmp()
-#include <errno.h>          // for errno
 
 #include <rw_process.h>     // for rw_process_create(), rw_waitpid()
 #include <driver.h>         // for rw_test()
diff --git a/tests/src/char.cpp b/tests/src/char.cpp
index b35c5f0..b1bc718 100644
--- a/tests/src/char.cpp
+++ b/tests/src/char.cpp
@@ -501,7 +501,7 @@
 {
     // compute the length of src if not specified
     if (_RWSTD_SIZE_MAX == len)
-        len = src ? strlen (src) + 1 : 0;
+        len = src ? strlen (src) : 0;
 
     if (len) {
         RW_ASSERT (0 != dst);
@@ -851,7 +851,7 @@
 {
     // compute the length of src if not specified
     if (_RWSTD_SIZE_MAX == len)
-        len = src ? strlen (src) + 1 : 0;
+        len = src ? strlen (src) : 0;
 
     // if len is non-zero dst must be non-0 as well
     RW_ASSERT (0 == len || 0 != dst);
@@ -999,7 +999,7 @@
 {
     // compute the length of src if not specified
     if (_RWSTD_SIZE_MAX == len)
-        len = src ? strlen (src) + 1 : 0;
+        len = src ? strlen (src) : 0;
 
     // if len is non-zero dst must be non-0 as well
     RW_ASSERT (0 == len || 0 != dst);
@@ -1287,7 +1287,7 @@
 
         nbytes = rw_asnprintf (pbuf, pbufsize, "%{+}%{#*s}", nelems, beg.pc);
     }
-    else if (_RWSTD_WCHAR_T_SIZE == elemsize) {
+    else if (_RWSTD_WCHAR_SIZE == elemsize) {
         if (nelems < 0)
             nbytes = rw_asnprintf (pbuf, pbufsize, "%{+}%{#ls}", beg.pwc);
         else
diff --git a/tests/src/ctype.cpp b/tests/src/ctype.cpp
index 2260b0c..10c31b3 100644
--- a/tests/src/ctype.cpp
+++ b/tests/src/ctype.cpp
@@ -829,9 +829,11 @@
                 break;
             }
         }
+
+        return dfault;
     }
 
-    return dfault;
+    return ch;
 }
 
 
@@ -1235,9 +1237,11 @@
                 break;
             }
         }
+
+        return dfault;
     }
 
-    return dfault;
+    return char (uch);
 }
 
 
@@ -1646,9 +1650,11 @@
                 break;
             }
         }
+
+        return dfault;
     }
 
-    return dfault;
+    return char (uch);
 }
 
 
diff --git a/tests/src/driver.cpp b/tests/src/driver.cpp
index 7f9b07c..f09bd9f 100644
--- a/tests/src/driver.cpp
+++ b/tests/src/driver.cpp
@@ -182,6 +182,12 @@
 #ifndef RW_TEST_HARDWARE
 #  if defined (__alpha__) || defined (__alpha)
 #    define RW_TEST_ARCH "alpha"
+#  elif defined (__x86_64__) || defined (__x86_64)
+#    if defined (__LP64__) || defined (_LP64)
+#      define RW_TEST_ARCH "x86_64/LP64"
+#    else
+#      define RW_TEST_ARCH "x86_64/ILP32"
+#    endif
 #  elif defined (__amd64__) || defined (__amd64)
 #    if defined (__LP64__) || defined (_LP64)
 #      define RW_TEST_ARCH "amd64/LP64"
@@ -240,12 +246,6 @@
 #    define RW_TEST_ARCH "ia64"
 #  elif defined (_WIN32)
 #    define RW_TEST_ARCH "i86"
-#  elif defined (__x86_64__) || defined (__x86_64)
-#    if defined (__LP64__) || defined (_LP64)
-#      define RW_TEST_ARCH "x86_64/LP64"
-#    else
-#      define RW_TEST_ARCH "x86_64/ILP32"
-#    endif
 #  else
 #    define RW_TEST_ARCH "unknown"
 #  endif
@@ -276,23 +276,15 @@
 #  elif defined (__sgi) && defined (__mips)
 #    define RW_TEST_OS "irix"
 #  elif defined (__linux__) || defined (__linux)
-
-     // get Linux release string (UTS_RELEASE)
-#    include <linux/version.h>
-
-#    ifndef UTS_RELEASE
-#      define UTS_RELEASE "(unknown release)"
-#    endif   // UTS_RELEASE
-
 #    if defined (__ELF__)
 #      define LINUX_TYPE "linux-elf"
 #    else
 #      define LINUX_TYPE "linux"
 #    endif
 
-#    define RW_TEST_OS LINUX_TYPE " "     \
-            UTS_RELEASE " with glibc "    \
-            RW_TEST_STR (__GLIBC__) "."   \
+#    define RW_TEST_OS LINUX_TYPE " ("           \
+            _RWSTD_LINUX_RELEASE ") with glibc " \
+            RW_TEST_STR (__GLIBC__) "."          \
             RW_TEST_STR (__GLIBC_MINOR__)
 
 #  elif defined (__SunOS_5_10)
diff --git a/tests/src/fmt_bits.cpp b/tests/src/fmt_bits.cpp
index 0f778e1..55aa8b2 100644
--- a/tests/src/fmt_bits.cpp
+++ b/tests/src/fmt_bits.cpp
@@ -48,6 +48,10 @@
 #  include <wctype.h>   // for iswalpha(), ...
 #endif   // _RWSTD_NO_WCTYPE_H
 
+#ifdef _WIN32
+#  include <windows.h>   // for FormatMessage()
+#endif   // _WIN32
+
 #include <ios>
 #include <iostream>
 #include <locale>
@@ -1005,6 +1009,42 @@
 /********************************************************************/
 
 /* extern */ int
+_rw_fmtlasterror (const FmtSpec &spec, Buffer &buf, int val)
+{
+#ifdef _WIN32
+
+    LPVOID pmsg;
+    FormatMessage (  FORMAT_MESSAGE_ALLOCATE_BUFFER
+                   | FORMAT_MESSAGE_FROM_SYSTEM
+                   | FORMAT_MESSAGE_IGNORE_INSERTS,
+                   0, (DWORD)val,
+                   MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
+                   (LPTSTR)&pmsg,
+                   0, 0);
+
+    FmtSpec newspec (spec);
+    newspec.width    = 0;
+    newspec.fl_pound = 0;
+
+    const int result = _rw_fmtstr (newspec, buf,
+                                   _RWSTD_STATIC_CAST (const char*, pmsg),
+                                   _RWSTD_SIZE_MAX);
+
+    LocalFree (pmsg);
+
+    return result;
+
+#else   // if !defined (_WIN32)
+
+    return _rw_fmterrno (spec, buf, val);
+
+#endif   // _WIN32
+
+}
+
+/********************************************************************/
+
+/* extern */ int
 _rw_fmtmask (const FmtSpec &spec, Buffer &buf, int bits)
 {
     static const Bitnames names [] = {
diff --git a/tests/src/fmt_defs.h b/tests/src/fmt_defs.h
index 7d9e3cc..3383c44 100644
--- a/tests/src/fmt_defs.h
+++ b/tests/src/fmt_defs.h
@@ -186,6 +186,10 @@
 extern int
 _rw_fmterrno (const FmtSpec&, Buffer&, int);
 
+// format Windows GetLastError(), or errno value/name
+extern int
+_rw_fmtlasterror (const FmtSpec&, Buffer&, int);
+
 // format the name/value of an LC_XXX constant/environment variable
 extern int
 _rw_fmtlc (const FmtSpec&, Buffer&, int);
diff --git a/tests/src/locale.cpp b/tests/src/locale.cpp
index 63f01d0..7994214 100644
--- a/tests/src/locale.cpp
+++ b/tests/src/locale.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software.
  * 
  **************************************************************************/
 
@@ -34,10 +34,8 @@
 
 #include <environ.h>      // for rw_putenv()
 #include <file.h>         // for SHELL_RM_RF, rw_tmpnam
-#include <rw_printf.h>    // for rw_fprintf()
 #include <rw_process.h>   // for rw_system()
-#include <cstdio>
-
+#include <driver.h>       // for rw_error()
 
 #if defined (_RWSTD_OS_LINUX) && !defined (_XOPEN_SOURCE)
    // on Linux define _XOPEN_SOURCE to get CODESET defined in <langinfo.h>
@@ -62,9 +60,7 @@
 #include <locale>     // for money_base::pattern
 
 #include <assert.h>   // for assert
-#include <errno.h>    // for EBADF
-#include <float.h>    // for {FLT,DBL,LDBL}_DIG
-#include <limits.h>   // for CHAR_BIT, MB_LEN_MAX, PATH_MAX
+#include <limits.h>   // for PATH_MAX
 #include <locale.h>   // for LC_XXX macros, setlocale
 #include <stdarg.h>   // for va_copy, va_list, ...
 #include <stdio.h>    // for fgets, remove, sprintf, ...
@@ -73,10 +69,6 @@
 #include <ctype.h>
 #include <wchar.h>    // for wcslen, ...
 
-#ifndef PATH_MAX
-#  define PATH_MAX   1024
-#endif
-
 #ifndef _MSC_VER
 #  include <clocale>
 #  ifndef LC_MESSAGES
@@ -89,6 +81,13 @@
 #endif  // _MSC_VER
 
 
+#if !defined (PATH_MAX) || PATH_MAX < 128 || 4096 < PATH_MAX
+   // deal  with undefined, bogus, or excessive values
+#  undef  PATH_MAX
+#  define PATH_MAX   1024
+#endif
+
+
 #define TOPDIR   "TOPDIR"   /* the TOPDIR environment variable */
 #define BINDIR   "BINDIR"   /* the BINDIR environment variable */
 
@@ -109,13 +108,20 @@
 #define RELPATH        "etc" SLASH "nls"
 #define TESTS_ETC_PATH "tests" SLASH "etc"
             
+// extension of the catalog file
+#ifndef _WIN32
+#  define RW_CAT_EXT ".cat"
+#else
+#  define RW_CAT_EXT ".dll"
+#endif
+
 /**************************************************************************/
 
 _TEST_EXPORT int
 rw_locale (const char *args, const char *fname)
 {
     // use BINDIR to determine the location of the locale command
-    const char* bindir = getenv ("BINDIR");
+    const char* bindir = getenv (BINDIR);
     if (!bindir)
         bindir = ".." SLASH "bin";
 
@@ -202,13 +208,14 @@
     // use TOPDIR to determine the root of the source tree
     const char* const topdir = getenv (TOPDIR);
     if (!topdir || !*topdir) {
-        fprintf (stderr, "%s:%d: the environment variable %s is %s\n",
-                 __FILE__, __LINE__, TOPDIR, topdir ? "empty" : "undefined");
+        rw_error (0, __FILE__, __LINE__,
+                  "the environment variable %s is %s",
+                  TOPDIR, topdir ? "empty" : "undefined");
         return 0;
     }
 
     // use BINDIR to determine the location of the localedef command
-    const char* bindir = getenv ("BINDIR");
+    const char* bindir = getenv (BINDIR);
     if (!bindir)
         bindir = ".." SLASH "bin";
 
@@ -272,7 +279,7 @@
 
 extern "C" {
 
-static char rw_locale_root [256];
+static char rw_locale_root [PATH_MAX];
 
 static void atexit_rm_locale_root ()
 {
@@ -318,8 +325,8 @@
     // where std::locale looks for locale database files
     rw_putenv (envvar);
 
-    if (atexit (atexit_rm_locale_root))
-        perror ("atexit(atexit_rm_locale_root) failed");
+    rw_error (0 == atexit (atexit_rm_locale_root), __FILE__, __LINE__,
+              "atexit(atexit_rm_locale_root) failed: %m");
 
     return locale_root;
 }
@@ -327,8 +334,9 @@
 /**************************************************************************/
 
 _TEST_EXPORT char*
-rw_locales (int loc_cat, const char* grep_exp)
+rw_locales (int loc_cat, const char* grep_exp, bool prepend_c_loc)
 {
+    static char deflocname [3] = "C\0";
     static char* slocname = 0;
 
     static size_t size       = 0;         // the number of elements in the array
@@ -360,7 +368,7 @@
     char* locname = slocname;
 
     char* save_localename = 0;
-    char  namebuf [256];
+    char  namebuf [PATH_MAX];
 
     if (loc_cat != _UNUSED_CAT) {
         // copy the locale name, the original may be overwitten by libc
@@ -370,7 +378,7 @@
     const char* const fname = rw_tmpnam (0);
 
     if (!fname) {
-        return 0;   // error
+        return deflocname;   // error
     }
 
     // make sure that grep_exp is <= 80 
@@ -385,7 +393,7 @@
         : rw_system ("locale -a > %s", fname);
 
     if (exit_status) {
-        return 0;   // error
+        return deflocname;   // error
     }
 
     // open file containing the list of installed locales
@@ -401,15 +409,33 @@
         char last_name [256];
         *last_name = '\0';
 
+        // put the C locale at the front
+        if (prepend_c_loc) {
+            strcpy (locname, deflocname);
+            locname += strlen (deflocname) + 1; 
+        }
+
         // if successful, construct a char array with the locales
         while (fgets (linebuf, sizeof linebuf, file)) {
 
-            linebuf [strlen (linebuf) - 1] = '\0';
+            const size_t linelen = strlen (linebuf);
+
+            linebuf [linelen ? linelen - 1 : 0] = '\0';
+
+            // don't allow C locale to be in the list again
+            // if we put it at the front of the locale list
+            if (prepend_c_loc && !strcmp (linebuf, deflocname))
+                continue;
 
 #ifdef _RWSTD_OS_SUNOS
 
-            // avoid the bad locale named iso_8859_1 on SunOS
-            if (!strcmp ("iso_8859_1", linebuf))
+            const char iso_8859_pfx[] = "iso_8859_";
+
+            // avoid locales named common and iso_8859_* on SunOS
+            // since they are known to cause setlocale() to fail
+            if (   !strcmp ("common", linebuf)
+                || sizeof iso_8859_pfx <= linelen 
+                && !memcmp (iso_8859_pfx, linebuf, sizeof iso_8859_pfx - 1))
                 continue;
 
 #endif   // _RWSTD_OS_SUNOS
@@ -422,7 +448,12 @@
                     _RWSTD_STATIC_CAST (char*, malloc (total_size));
 
                 memcpy (tmp, slocname, total_size - 5120);
+
+#ifndef _MSC_VER
                 free (slocname);
+#else
+                _free_dbg (slocname, _CLIENT_BLOCK);
+#endif
 
                 slocname = tmp;
                 locname  = slocname + size - strlen (linebuf) - 1;
@@ -470,7 +501,7 @@
 
     remove (fname);
 
-    return slocname;
+    return *slocname ? slocname : deflocname;
 }
 
 /**************************************************************************/
@@ -508,7 +539,7 @@
         *buf = '\0';
     }
 
-#if 2 < _RWSTD_WCHAR_T_SIZE
+#if 2 < _RWSTD_WCHAR_SIZE
 
     // if a multibyte character of the requested size is not found
     // in the low 64K range, try to find one using a random search
@@ -551,12 +582,11 @@
 
     const char* mbc = _get_mb_char (mb_chars [0], size_t (-1));
 
-    if (!mbc) {
-        rw_fprintf (rw_stderr, "*** failed to find any multibyte characters "
-                    "in locale \"%s\" with MB_CUR_MAX = %u\n",
-                    setlocale (LC_CTYPE, 0), MB_CUR_MAX);
+    if (0 == rw_note (0 != mbc, __FILE__, __LINE__,
+                      "failed to find any multibyte characters "
+                      "in locale \"%s\" with MB_CUR_MAX = %u",
+                      setlocale (LC_CTYPE, 0), MB_CUR_MAX))
         return 0;
-    }
 
     size_t mb_cur_max = strlen (mbc);
 
@@ -571,10 +601,13 @@
         mbc = _get_mb_char (mb_chars [i - 1], i);
 
         if (0 == mbc) {
-            if (i < mb_cur_max) {
-                rw_fprintf (rw_stderr, "*** failed to find %u-byte characters "
-                            "in locale \"%s\" with MB_CUR_MAX = %u\n",
-                            i + 1, setlocale (LC_CTYPE, 0), MB_CUR_MAX);
+            // zh_CN.gb18030 and zh_TW.euctw on Linux are examples
+            // of multibyte locales where MB_CUR_MAX == 4 but,
+            // apparently, no 3-byte characters
+            if (0 == rw_note (mb_cur_max <= i, __FILE__, __LINE__,
+                              "failed to find %u-byte characters "
+                              "in locale \"%s\" with MB_CUR_MAX = %u",
+                              i, setlocale (LC_CTYPE, 0), MB_CUR_MAX)) {
                 mb_cur_max = 0;
                 break;
             }
@@ -586,6 +619,67 @@
 }
 
 
+_TEST_EXPORT size_t
+rw_get_wchars (wchar_t *wbuf, size_t bufsize, int nbytes /* = 0 */)
+{
+    if (0 == bufsize)
+        return 0;
+
+    char tmp [_RWSTD_MB_LEN_MAX];
+
+    size_t nchars = 0;
+
+    for (int i = 0; i != 65536; ++i) {
+
+        // determine whether the wide character is valid
+        // and if so, the length of the multibyte character
+        // that corresponds to it
+        const int len = wctomb (tmp, wchar_t (i));
+
+        if (nbytes == 0 && 0 < len || nbytes != 0 && nbytes == len) {
+            // if the requested length is 0 (i.e., the caller doesn't
+            // care) and the character is valid, store it
+            // if the requested length is non-zero (including -1),
+            // and the value returned from mblen() is the same, store
+            // it (this makes it possible to find invalid characters
+            // as well as valid ones)
+            wbuf [nchars++];
+            if (nchars == bufsize)
+                return nchars;
+        }
+    }
+
+#if 2 < _RWSTD_WCHAR_SIZE
+
+    // try to find the remaining wide characters by a random
+    // search, iterating only so many times to prevent an
+    // infinite loop
+    for (int i = 0; i != 0x100000; ++i) {
+
+        // make a wide character with a random bit pattern
+        wchar_t wc = wchar_t (rand ());
+
+        if (RAND_MAX < 0x10000) {
+            wc <<= 16;
+            wc |= wchar_t (rand ());
+        }
+
+        const int len = wctomb (tmp, wchar_t (i));
+
+        if (nbytes == 0 && 0 < len || nbytes != 0 && nbytes == len) {
+            wbuf [nchars++];
+            if (nchars == bufsize)
+                return nchars;
+        }
+    }
+
+#endif   // 2 < _RWSTD_WCHAR_SIZE
+
+    return nchars;
+
+}
+
+
 _TEST_EXPORT const char*
 rw_find_mb_locale (size_t            *mb_cur_max,
                    rw_mbchar_array_t  mb_chars)
@@ -594,8 +688,8 @@
     _RWSTD_ASSERT (0 != mb_chars);
 
     if (2 > _RWSTD_MB_LEN_MAX) {
-        rw_fprintf (rw_stderr, "MB_LEN_MAX = %d, giving up\n",
-                    _RWSTD_MB_LEN_MAX);
+        rw_warn (0, __FILE__, __LINE__, "MB_LEN_MAX = %d, giving up",
+                 _RWSTD_MB_LEN_MAX);
         return 0;
     }
 
@@ -631,9 +725,10 @@
     }
 
     if (*mb_cur_max < 2) {
-        rw_fprintf (rw_stderr, "*** failed to find a full set of multibyte "
-                    "characters in locale \"%s\" with MB_CUR_MAX = %u "
-                    "(computed)", mb_locale_name, *mb_cur_max);
+        rw_warn (0, __FILE__, __LINE__,
+                 "failed to find a full set of multibyte "
+                 "characters in locale \"%s\" with MB_CUR_MAX = %u "
+                 "(computed)", mb_locale_name, *mb_cur_max);
         mb_locale_name = 0;
     }
     else {
@@ -671,36 +766,36 @@
 
     // create a temporary locale definition file that exercises as
     // many different parts of the collate standard as possible
-    char srcfname [256];
-    std::sprintf (srcfname, "%s%slocale.src", locale_root, SLASH);
+    char srcfname [PATH_MAX];
+    sprintf (srcfname, "%s%slocale.src", locale_root, SLASH);
 
-    std::FILE *fout = std::fopen (srcfname, "w");
+    FILE *fout = fopen (srcfname, "w");
 
     if (!fout) {
-        std::fprintf (stderr, "%s:%d: fopen(\"%s\", \"w\") failed\n",
-                      __FILE__, __LINE__, srcfname);
+        rw_error (0, __FILE__, __LINE__,
+                  "fopen(#%s, \"w\") failed: %m", srcfname);
         return 0;
     }
 
-       std::fprintf (fout, "%s", locale);
+    fprintf (fout, "%s", locale);
 
-    std::fclose (fout);
+    fclose (fout);
 
     // create a temporary character map file
-    char cmfname [256];
-    std::sprintf (cmfname, "%s%scharmap.src", locale_root, SLASH);
+    char cmfname [PATH_MAX];
+    sprintf (cmfname, "%s%scharmap.src", locale_root, SLASH);
 
-    fout = std::fopen (cmfname, "w");
+    fout = fopen (cmfname, "w");
 
     if (!fout) {
-        std::fprintf (stderr, "%s:%d: fopen(\"%s\", \"w\") failed\n",
-                      __FILE__, __LINE__, cmfname);
+        rw_error (0, __FILE__, __LINE__,
+                  "fopen(%#s, \"w\") failed: %m", cmfname);
         return 0;
     }
 
-       std::fprintf (fout, "%s", charmap);
+       fprintf (fout, "%s", charmap);
 
-    std::fclose (fout);
+    fclose (fout);
 
        locname = "test-locale";
 
@@ -710,3 +805,115 @@
 
     return locname;
 }
+
+
+/**************************************************************************/
+
+static const char*
+_rw_locale_names;
+
+_TEST_EXPORT const char* const&
+rw_opt_locales = _rw_locale_names;
+
+
+_TEST_EXPORT int
+rw_opt_setlocales (int argc, char* argv[])
+{
+    if (1 == argc && argv && 0 == argv [0]) {
+        static const char helpstr[] = {
+            "Use the locales specified by the space-parated list of locale"
+            "names given by <arg>.\n"
+        };
+
+        argv [0] = _RWSTD_CONST_CAST (char*, helpstr);
+
+        return 0;
+    }
+
+    // the option requires an equals sign followed by an optional argument
+    char *args = strchr (argv [0], '=');
+
+    RW_ASSERT (0 != args);
+
+    // small static buffer should be sufficient in most cases
+    static char buffer [256];
+
+    const size_t len = strlen (++args);
+
+    // dynamically allocate a bigger buffer when the small buffer
+    // isn't big enough (let the dynamically allocated buffer leak)
+    char* const locale_names =
+        sizeof buffer < len + 2 ? (char*)malloc (len + 2) : buffer;
+
+    if (0 == locale_names)
+        return 1;
+
+    locale_names [len]     = '\0';
+    locale_names [len + 1] = '\0';
+
+    memcpy (locale_names, args, len);
+
+    for (char *next = locale_names; ; ) {
+        next = strpbrk (next, ", ");
+        if (next)
+            *next++ = '\0';
+        else
+            break;
+    }
+
+    _rw_locale_names = locale_names;
+
+    // return 0 on success
+    return 0;
+}
+
+
+/**************************************************************************/
+
+_TEST_EXPORT int
+rw_create_catalog (const char * catname, const char * catalog)
+{
+    RW_ASSERT (catname && catalog);
+
+    FILE* const f = fopen (catname, "w");
+
+    if (!f)
+        return -1;
+
+#ifndef _WIN32
+
+    for (int i = 1; *catalog; ++catalog, ++i) {
+        fprintf (f, "$set %d This is Set %d\n", i, i);
+        for (int j = 1; *catalog; catalog += strlen (catalog) + 1, ++j)
+             fprintf (f, "%d %s\n", j, catalog);
+    }
+
+#else   // if defined (_WIN32)
+
+    fprintf (f, "STRINGTABLE\nBEGIN\n");
+
+    for (int i = 1; *catalog; ++catalog) {
+        for (; *catalog; catalog += strlen (catalog) + 1, ++i)
+            fprintf (f, "%d \"%s\"\n", i, catalog);
+    }
+
+    fprintf (f, "END\n");
+
+#endif   // _WIN32
+
+    fclose (f);
+
+    char *cat_name = new char [strlen (catname) + 1];
+    strcpy (cat_name, catname);
+    if (char *dot = strrchr (cat_name, '.'))
+        *dot = '\0';
+
+    const int ret = rw_system ("gencat %s" RW_CAT_EXT " %s",
+                               cat_name, catname);
+
+    delete[] cat_name;
+
+    remove (catname);
+
+    return ret;
+}
diff --git a/tests/src/printf.cpp b/tests/src/printf.cpp
index f1b7664..59c49ae 100644
--- a/tests/src/printf.cpp
+++ b/tests/src/printf.cpp
@@ -57,7 +57,7 @@
    // define macros to enable Win98 + WinNT support in <windows.h>
 #  define _WIN32_WINNT 0x0410
 #  define WINVER       0x400
-#  include <windows.h>   // for IsDebuggerPresent()
+#  include <windows.h>   // for GetLastError(), IsDebuggerPresent()
 #else
 #  include <dlfcn.h>
 #endif   // _WIN{32,64}
@@ -1843,25 +1843,25 @@
 template <class charT>
 int _rw_quotechar (char *buf, charT wc, int noesc)
 {
-#if _RWSTD_WCHAR_T_MIN < 0
+#if _RWSTD_WCHAR_MIN < 0
 
     // wchar_t is signed, convert its value to unsigned long
     // without widening (i.e., treat it as an unsigned type)
 
-#  if _RWSTD_WCHAR_T_MIN == _RWSTD_SHRT_MIN
+#  if _RWSTD_WCHAR_MIN == _RWSTD_SHRT_MIN
     const ULong wi = UShrt (wc);
-#  elif _RWSTD_WCHAR_T_MIN ==_RWSTD_INT_MIN
+#  elif _RWSTD_WCHAR_MIN ==_RWSTD_INT_MIN
     const ULong wi = UInt (wc);
-#  elif _RWSTD_WCHAR_T_MIN == _RWSTD_LONG_MIN
+#  elif _RWSTD_WCHAR_MIN == _RWSTD_LONG_MIN
     const ULong wi = ULong (wc);
 #  endif
 
-#else   // if _RWSTD_WCHAR_T_MIN >= 0
+#else   // if _RWSTD_WCHAR_MIN >= 0
 
     // wchar_t is unsigned
     const ULong wi = ULong (wc);
 
-#endif   // _RWSTD_WCHAR_T_MIN < 0
+#endif   // _RWSTD_WCHAR_MIN < 0
 
     if ((1 == sizeof wc || wi < 0x100) && noesc) {
         buf [0] = char (wc);
@@ -1978,7 +1978,7 @@
             // wchar_t (bot not for an array of wchar_t's being
             // formatted using the {%ls} directive -- the caller
             // can easily stick the 'L' there themselves)
-            if (flags & A_ARRAY && _RWSTD_WCHAR_T_SIZE == sizeof (elemT))
+            if (flags & A_ARRAY && _RWSTD_WCHAR_SIZE == sizeof (elemT))
                 *next++ = 'L';
 
             *next++ = '"';
@@ -2067,7 +2067,7 @@
             if (last_repeat < 0) {
                 if (flags & (A_CHAR | A_WCHAR)) {
                     if (   (flags & A_ARRAY)
-                        && _RWSTD_WCHAR_T_SIZE == sizeof (elemT))
+                        && _RWSTD_WCHAR_SIZE == sizeof (elemT))
                         *s++ = 'L';
 
                     // insert an opening quote
@@ -2694,6 +2694,15 @@
         }
         break;
 
+    case 'E':   // %{E} -- Windows GetLastError(), errno elsewhere
+#ifdef _WIN32
+        spec.param.int_ = -1 == spec.width ? GetLastError () : spec.width;
+#else   // if !defined (_WIN32)
+        spec.param.int_ = -1 == spec.width ? errno : spec.width;
+#endif   // _WIN32
+        len = _rw_fmtlasterror (spec, buf, spec.param.int_);
+        break;
+
     case 'e':   // %{e}, %{Ae}
         if (spec.mod == spec.mod_ext_A) {   // array of floating point values
             spec.param.ptr_ = PARAM (ptr_, pva);
@@ -2771,7 +2780,8 @@
         break;
 
     case 'm':   // %{m} -- errno
-        len = _rw_fmterrno (spec, buf, -1 == spec.width ? errno : spec.width);
+        spec.param.int_ = -1 == spec.width ? errno : spec.width;
+        len = _rw_fmterrno (spec, buf, spec.param.int_);
         break;
 
     case 'M':   // %{M}, %{LM}
@@ -3329,7 +3339,7 @@
     va_end (va);
 
     if (-1 < nchars)
-        memcpy (buf, tmpbuf, size_t (nchars));
+        memcpy (buf, tmpbuf, size_t (nchars + 1 /* NUL */));
 
     free (tmpbuf);
 
diff --git a/tests/src/process.cpp b/tests/src/process.cpp
index b288c79..89e981d 100644
--- a/tests/src/process.cpp
+++ b/tests/src/process.cpp
@@ -27,10 +27,6 @@
 // expand _TEST_EXPORT macros
 #define _RWSTD_TEST_SRC
 
-// disable Compaq/HP C++ pure libc headers to allow POSIX symbols
-// such as E2BIG to be defined
-#undef __PURE_CNAME
-
 #include <rw_process.h>
 
 #include <ctype.h>        // for isspace()
diff --git a/tests/src/thread.cpp b/tests/src/thread.cpp
index 482afa2..87d9c1a 100644
--- a/tests/src/thread.cpp
+++ b/tests/src/thread.cpp
@@ -33,6 +33,13 @@
 #include <stddef.h>     // for size_t
 #include <string.h>     // for memset()
 
+#ifndef _WIN32
+#  include <stdio.h>      // for FILE, fscanf(), popen()
+#  include <unistd.h>     // for sysconf(), _SC_NPROCESSORS_{CONF,ONLN}
+#else
+#  include <windows.h>    // for GetSystemInfo()
+#endif   // _WIN32
+
 /**************************************************************************/
 
 static long maxthreads;
@@ -167,13 +174,6 @@
 
 extern "C" {
 
-#  ifdef __PURE_CNAME
-
-extern int sigsetjmp (jmp_buf, int);
-
-#  endif
-
-
 _TEST_EXPORT int
 rw_thread_create (rw_thread_t *thr_id,
                   rw_thread_attr_t*,
@@ -240,8 +240,8 @@
 
 /**************************************************************************/
 
-#elif defined (_WIN32) || defined (_WIN64)
-#  include <windows.h>
+#elif defined (_WIN32) && defined (_MT)
+#  include <process.h>    // for _beginthreadex()
 
 extern "C" {
 
@@ -258,34 +258,33 @@
     if (0 == thr_id)
         thr_id = &tmpid;
 
-    DWORD nid;   // numerical id
+    unsigned nid;   // numerical id
 
-    typedef DWORD ThreadProc (LPVOID);
-
-    LPTHREAD_START_ROUTINE win32_thr_proc =
-        _RWSTD_REINTERPRET_CAST (LPTHREAD_START_ROUTINE, thr_proc);
+    typedef unsigned int (__stdcall *win32_thr_proc_t)(void *);
+    win32_thr_proc_t win32_thr_proc =
+        _RWSTD_REINTERPRET_CAST (win32_thr_proc_t, thr_proc);
 
     // set the thread number *before* creating the thread
     // so that it's visible in thr_proc when it starts to
     // run even before CreateThread returns
     thr_id->threadno = maxthreads;
 
-    const HANDLE hthread =
-        CreateThread (0,                // lpThreadAttributes
-                      0,                // dwStackSize
-                      win32_thr_proc,   // lpStartAddress
-                      thr_arg,          // lpParameter
-                      0,                // dwCreationFlags
-                      &nid);            // lpThreadId
+    const uintptr_t hthread =
+        _beginthreadex (0,                // lpThreadAttributes
+                        0,                // dwStackSize
+                        win32_thr_proc,   // lpStartAddress
+                        thr_arg,          // lpParameter
+                        0,                // dwCreationFlags
+                        &nid);            // lpThreadId
 
-    if (INVALID_HANDLE_VALUE == hthread) {
+    if (!hthread) {
         thr_id->id     = -1;
         thr_id->handle = 0;
         result         = -1;
     }
     else {
         thr_id->id     = nid;
-        thr_id->handle = hthread;
+        thr_id->handle = _RWSTD_REINTERPRET_CAST (void*, hthread);
         ++maxthreads;
     }
 
@@ -369,22 +368,132 @@
 
 #endif   // threads environment
 
+/**************************************************************************/
+
+// retrieves the number of processors/cores on the system
+_TEST_EXPORT int
+rw_get_cpus ()
+{
+#ifndef _WIN32
+
+    const char* const cmd = {
+        // shell command(s) to obtain the number of processors
+
+#  ifdef _RWSTD_OS_AIX
+        // AIX: /etc/lsdev -Cc processor | wc -l
+        "/etc/lsdev -Cc processor | /usr/bin/wc -l"
+#  elif defined (_RWSTD_OS_LINUX)
+        // Linux: cat /proc/cpuinfo | grep processor | wc -l
+        "cat /proc/cpuinfo "
+        "  | grep processor "
+        "  | wc -l"
+#  elif defined (_RWSTD_OS_FREEBSD)
+        // FreeBSD: /sbin/sysctl -n hw.ncpu
+        "/sbin/sysctl -n hw.ncpu"
+#  elif defined (_RWSTD_OS_HP_UX)
+        // HP-UX: /etc/ioscan -k -C processor | grep processor | wc -l
+        "/etc/ioscan -k -C processor "
+        "  | /usr/bin/grep processor "
+        "  | /usr/bin/wc -l"
+#  elif defined (_RWSTD_OS_IRIX64)
+        // IRIX: hinv | /usr/bin/grep "^[1-9][0-9]* .* Processor"
+        "/sbin/hinv "
+        "  | /usr/bin/grep \"^[1-9][0-9]* .* Processor\""
+#  elif defined (_RWSTD_OS_OSF1)
+        // Tru64 UNIX: /usr/sbin/psrinfo | grep online | wc -l
+        "/usr/sbin/psrinfo "
+        "  | /usr/bin/grep on[-]*line "
+        "  | /usr/bin wc -l"
+#  elif defined (_RWSTD_OS_SUNOS)
+        // Solaris: /usr/bin/mpstat | wc -l
+        "/usr/bin/mpstat "
+        "  | /usr/bin/grep -v \"^CPU\" "
+        "  | /usr/bin/wc -l"
+#  else
+        0
+#  endif
+
+    };
+
+    int ncpus = -1;
+
+#  ifdef _SC_NPROCESSORS_ONLN
+    // try to obtain the number of processors that are currently online
+    // programmatically and fall back on the shell script above if it
+    // fails
+    ncpus = int (sysconf (_SC_NPROCESSORS_ONLN));
+
+#  elif defined (_SC_NPROCESSORS_CONF)
+
+    // try to obtain the number of processors the system is configured
+    // with (not all of them are necessarily online) programmatically
+    // and fall back on the shell script above if it fails
+    ncpus = int (sysconf (_SC_NPROCESSORS_CONF));
+
+#  endif   // _SC_NPROCESSORS_CONF
+
+    if (ncpus < 1 && cmd) {
+        // if the number of processors couldn't be determined using
+        // sysconf() above,  open and read the output of the command
+        // from a pipe
+        FILE* const fp = popen (cmd, "r");
+
+        if (fp) {
+            int tmp = 0;
+        
+            int n = fscanf (fp, "%d", &tmp);
+
+            if (1 == n)
+                ncpus = tmp;
+
+            fclose (fp);
+        }
+    }
+
+    return ncpus;
+
+#else    // _WIN32
+
+    SYSTEM_INFO info;
+    GetSystemInfo (&info);
+    return int (info.dwNumberOfProcessors);
+
+#endif   // _WIN32
+}
+
+/**************************************************************************/
 
 extern "C" {
 
 
 _TEST_EXPORT int
-rw_thread_pool (rw_thread_t *thr_id, size_t nthrs,
+rw_thread_pool (rw_thread_t        *thr_id,
+                size_t              nthrs,
                 rw_thread_attr_t*,
-                void* (*thr_proc)(void*),
-                void **thr_arg)
+                void*             (*thr_proc)(void*),
+                void*              *thr_arg)
 {
     // small buffer for thread ids when invoked with (thr_id == 0)
     rw_thread_t id_buf [16];
 
     const bool join = 0 == thr_id;
 
-#ifndef _RWSTD_REENTRANT
+#ifdef _RWSTD_REENTRANT
+
+    if (_RWSTD_SIZE_MAX == nthrs) {
+        // when the number of threads is -1 use the number
+        // of processors plus 1 (in case it's 1 to begin
+        // with)
+
+        const int ncpus = rw_get_cpus ();
+
+        if (0 < ncpus)
+            nthrs = size_t (ncpus) + 1;
+        else
+            nthrs = 2;
+    }
+
+#else
 
     // when not reentrant/thread safe emulate the creation
     // of a single thread and then waiting for it to finish
@@ -408,7 +517,6 @@
 
         return 0;
     }
-
 #endif   // !_RWSTD_REENTRANT
 
     bool delete_ids = false;
diff --git a/tests/strings/21.cwchar.cpp b/tests/strings/21.cwchar.cpp
index fc94d7b..8888026 100644
--- a/tests/strings/21.cwchar.cpp
+++ b/tests/strings/21.cwchar.cpp
@@ -87,10 +87,6 @@
 
 /**************************************************************************/
 
-#ifdef _MSC_VER
-#include <crtdbg.h>   // for _CrtSetReportMode()
-#endif
-
 #include <cwchar>
 #include <any.h>      // for rw_any_t
 #include <driver.h>   // for rw_test(), ...
@@ -822,6 +818,11 @@
 GET_TYPE_NAME (unsigned long);
 GET_TYPE_NAME (double);
 
+#ifndef _RWSTD_NO_LONG_LONG
+GET_TYPE_NAME (_RWSTD_LONG_LONG);
+GET_TYPE_NAME (unsigned _RWSTD_LONG_LONG);
+#endif
+
 #ifndef _RWSTD_NO_NATIVE_WCHAR_T
 GET_TYPE_NAME (wchar_t);
 #endif
@@ -926,16 +927,16 @@
     const test_tm* tmb = (const test_tm*)&tm_buf;
 
 #ifdef _MSC_VER
-    // disable GUI window with error:
-    // Assertion failed: ("Zero length output buffer passed to strftime",0)
-    int oldmode = _CrtSetReportMode (_CRT_ASSERT, _CRTDBG_MODE_DEBUG);
+    // prevent MSVC parameter validation error:
+    // "Zero length output buffer passed to strftime"
+    size = 1;
 #endif
 
     TEST (test_size_t, wcsftime, (wstr, size, L"", tmb), WCSFTIME, -1);
 
 #ifdef _MSC_VER
-    // restore error report mode
-    _CrtSetReportMode (_CRT_ASSERT, oldmode);
+    // restore size
+    size = 0;
 #endif
 
     TEST (test_wint_t, btowc, (i), BTOWC, -1);
diff --git a/tests/strings/21.string.access.cpp b/tests/strings/21.string.access.cpp
index 8f674ba..bdd8f7c 100644
--- a/tests/strings/21.string.access.cpp
+++ b/tests/strings/21.string.access.cpp
@@ -266,10 +266,12 @@
             return;
         }
 
-        const char exp_res =
-            NPOS != tcase.nres ? char (tcase.nres) : char ();
+        const char exp_res [2] = {
+            NPOS != tcase.nres ? char (tcase.nres) : char (),
+            char ()
+        };
 
-        const bool success = 1 == rw_match (&exp_res, pres, 1);
+        const bool success = 1 == rw_match (exp_res, pres, 1);
 
         rw_assert (success, 0, tcase.line,
                    "line %d. %{$FUNCALL} == %{#c}, got %{#c}",
diff --git a/tests/strings/21.string.cons.cpp b/tests/strings/21.string.cons.cpp
index b443531..e331285 100644
--- a/tests/strings/21.string.cons.cpp
+++ b/tests/strings/21.string.cons.cpp
@@ -699,11 +699,11 @@
             break;
 
         case Cons (size_val):
-            ret_ptr = new String (tcase.size, arg_val);
+            ret_ptr = new String (arg_size, arg_val);
             break;
 
         case Cons (size_val_alloc):
-            ret_ptr = new String (tcase.size, arg_val, arg_alc);
+            ret_ptr = new String (arg_size, arg_val, arg_alc);
             break;
 
         case Cons (range):
diff --git a/tests/strings/21.string.copy.cpp b/tests/strings/21.string.copy.cpp
index 91bedad..b3f94d6 100644
--- a/tests/strings/21.string.copy.cpp
+++ b/tests/strings/21.string.copy.cpp
@@ -187,11 +187,12 @@
     std::size_t res = 0;
 
     // create destination array and initialize it with garbage
-    charT* const s_res = new charT [min_len + 1];
+    charT* const s_res = new charT [min_len + 2];
 
-    char cgb = '#';
-    charT wcgb = make_char (cgb, (charT*)0);
+    const char cgb [2] = "#";
+    const charT wcgb = make_char (cgb [0], (charT*)0);
     Traits::assign (s_res, min_len + 1, wcgb);
+    s_res [min_len + 1] = charT ();
 
     // save the state of the string object before the call
     // to detect wxception safety violations (changes to
@@ -247,7 +248,7 @@
                        __LINE__, int (tcase.nres), tcase.res, 
                        int (sizeof (charT)), int (res), s_res, match);
 
-            success = 1 == rw_match (&cgb, &s_res [min_len], 1);
+            success = 1 == rw_match (cgb, s_res + min_len, 1);
             rw_assert (success, 0, tcase.line,
                        "line %d. %{$FUNCALL} detected writing past the end of "
                        "the provided buffer", __LINE__);
diff --git a/tests/strings/21.string.find.first.not.of.cpp b/tests/strings/21.string.find.first.not.of.cpp
index 5629981..a484998 100644
--- a/tests/strings/21.string.find.first.not.of.cpp
+++ b/tests/strings/21.string.find.first.not.of.cpp
@@ -396,14 +396,7 @@
     TEST ("abcdefghij", "abc",        10,  3, NPOS,       0),
     TEST ("abcdefghij", "cba",        10,  1, NPOS,       0),
 
-#ifndef _RWSTD_NO_EXCEPTIONS
-
-    TEST ("",           "cba",         0, -1,    0,       1),
-    TEST ("abcdefghij", "cba",         0, -1,    0,       1),
-    TEST ("x@4096",     "xxx",         0, -1,    0,       1),
-    TEST ("abcdefghij", "x@4096",      0, -1,    0,       1),
-
-#endif   // _RWSTD_NO_EXCEPTIONS
+    TEST ("",           "cba",         0, -1, NPOS,       0),
 
     TEST ("last test", "test",         0,  4,    0,       0)
 };
diff --git a/tests/strings/21.string.find.first.of.cpp b/tests/strings/21.string.find.first.of.cpp
index 2a7d6a9..c7cf337 100644
--- a/tests/strings/21.string.find.first.of.cpp
+++ b/tests/strings/21.string.find.first.of.cpp
@@ -404,10 +404,10 @@
     TEST ("abcdefghij", "abc",        10,  3, NPOS,       0),
     TEST ("abcdefghij", "cba",        10,  1, NPOS,       0),
 
-    TEST ("",           "cba",         0, -1,    0,       1),
-    TEST ("abcdefghij", "cba",         0, -1,    0,       1),
-    TEST ("x@4096",     "xxx",         0, -1,    0,       1),
-    TEST ("abcdefghij", "x@4096",      0, -1,    0,       1),
+    TEST ("",           "cba",         0, -1, NPOS,       0),
+    TEST ("abcdefghij", "cba",         0, -1,    0,       0),
+    TEST ("x@4096",     "xxx",         0, -1,    0,       0),
+    TEST ("abcdefghij", "ax@4096",     0, -1,    0,       0),
 
     TEST ("last test", "test",         0,  4,    2,       0)
 };
diff --git a/tests/strings/21.string.find.last.not.of.cpp b/tests/strings/21.string.find.last.not.of.cpp
index 8c60090..40b5b21 100644
--- a/tests/strings/21.string.find.last.not.of.cpp
+++ b/tests/strings/21.string.find.last.not.of.cpp
@@ -404,10 +404,7 @@
     TEST ("defghijabc", "abc",        15,  3,    6,       0),
     TEST ("defghijabc", "cba",        15,  1,    8,       0),
 
-    TEST ("",           "cba",         0, -1,    0,       1),
-    TEST ("abcdefghij", "cba",         0, -1,    0,       1),
-    TEST ("x@4096",     "xxx",         0, -1,    0,       1),
-    TEST ("abcdefghij", "x@4096",      0, -1,    0,       1),
+    TEST ("",           "cba",         0, -1, NPOS,       0),
 
     TEST ("last test",  "test",        9,  4,    4,       0)
 };
diff --git a/tests/strings/21.string.find.last.of.cpp b/tests/strings/21.string.find.last.of.cpp
index aad8345..c6f7109 100644
--- a/tests/strings/21.string.find.last.of.cpp
+++ b/tests/strings/21.string.find.last.of.cpp
@@ -424,10 +424,10 @@
     TEST ("abcdefghij", "abc",        10,  3,    2,       0),
     TEST ("abcdefghij", "cba",        10,  1,    2,       0),
 
-    TEST ("",           "cba",         0, -1,    0,       1),
-    TEST ("abcdefghij", "cba",         0, -1,    0,       1),
-    TEST ("x@4096",     "xxx",         0, -1,    0,       1),
-    TEST ("abcdefghij", "x@4096",      0, -1,    0,       1),
+    TEST ("",           "cba",         0, -1, NPOS,       0),
+    TEST ("abcdefghij", "cbaj",        9, -1,    9,       0),
+    TEST ("x@4096",     "xxx",      4095, -1, 4095,       0),
+    TEST ("abcdefghij", "jx@4096",     9, -1,    9,       0),
 
     TEST ("last test", "test",         9,  4,    8,       0)
 };
diff --git a/tests/support/18.csetjmp.cpp b/tests/support/18.csetjmp.cpp
new file mode 100644
index 0000000..7269adc
--- /dev/null
+++ b/tests/support/18.csetjmp.cpp
@@ -0,0 +1,106 @@
+/***************************************************************************
+ *
+ * 18.csetjmp.cpp - test exercising [support.runtime], header <csetjmp>
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
+#include <csetjmp>
+#include <driver.h>
+
+/**************************************************************************/
+
+std::jmp_buf env;
+
+void test_longjmp (int arg)
+{
+    std::longjmp (env, arg);
+
+    rw_assert (0, 0, __LINE__,
+               "call to std::longjmp(..., %d) returned", arg);
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+#ifdef longjmp
+
+    // longjmp must not be #defined as a macro
+    rw_assert (0, 0, __LINE__, "longjmp #defined as a macro");
+
+#endif   // longjmp
+
+#ifdef jmp_buf
+
+    //jmp_buf must not be #defined as a macro
+    rw_assert (0, 0, __LINE__, "jmp_buf #defined as a macro");
+
+#endif   // jmp_buf
+
+#ifndef setjmp
+
+    //setjmp must be #defined as a macro
+    rw_assert (0, 0, __LINE__, "macro setjmp not #defined");
+
+#endif   // setjmp
+
+    // verify that setjmp works
+    int arg = 1;
+    int result;
+
+    result = setjmp (env);
+
+    if (0 == result) {
+
+        test_longjmp (arg);
+
+        rw_assert (0, 0, __LINE__,
+                   "call to std::longjmp(..., %d) returned", arg);
+    }
+    else {
+        rw_assert (arg == result, 0, __LINE__,
+                   "std::longjmp(..., %d) returned %d from setjmp()",
+                   arg, result);
+
+        // repeat a couple more times
+        if (arg < 3)
+            test_longjmp (++arg);
+    }
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "support.runtime",
+                    "header <csetjmp>",
+                    run_test,
+                    "",
+                    (void*)0);
+}
diff --git a/tests/support/18.exception.cpp b/tests/support/18.exception.cpp
index 9467541..7d452e1 100644
--- a/tests/support/18.exception.cpp
+++ b/tests/support/18.exception.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -727,6 +727,15 @@
     E_bad_alloc, E_bad_cast, E_bad_exception, E_bad_typeid, E_error
 };
 
+
+// helper classes used by the bad_cast test
+// defined at namespace scope rather than at local scope
+// to work around an Intel C++ 10.0 ICE (see STDCXX-475)
+struct Base { virtual ~Base () { } };
+struct Derived1: Base { };
+struct Derived2: Base { };
+
+
 // induce the language runtime into throwing an exception
 // returns e if exception cannot bee thrown
 static RuntimeExceptionId
@@ -801,14 +810,11 @@
 
 #ifndef _RWSTD_NO_DYNAMIC_CAST
 
-        struct A { virtual ~A () { } };
-        struct B: A { } b;
-        struct C: A { };
-
-        A &a = b;
+        Derived1 b;
+        Base &a = b;
 
         // induce bad_cast
-        dynamic_cast<C&>(a);
+        dynamic_cast<Derived2&>(a);
 
         return E_error;
 
diff --git a/tests/support/18.limits.cvqual.cpp b/tests/support/18.limits.cvqual.cpp
index c226772..6b47696 100644
--- a/tests/support/18.limits.cvqual.cpp
+++ b/tests/support/18.limits.cvqual.cpp
@@ -1,28 +1,32 @@
-// -*- C++ -*-
 /***************************************************************************
  *
- * 18.limits.cvqual.cpp - test exercising lib.numeric.limits
+ * 18.limits.cvqual.cpp:
+ *
+ *   Test exercising lib.numeric.limits, numeric_limits specializations
+ *   on cv-qualified scalar types. See DR 559 for details:
+ *   http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-defects.html#559
  *
  * $Id$
  *
  ***************************************************************************
  *
- * Copyright 2006 The Apache Software Foundation or its licensors,
- * as applicable.
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- * Copyright 2006 Rogue Wave Software.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2006-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -52,6 +56,8 @@
     typedef std::numeric_limits<T>            limits;
     typedef std::numeric_limits<CVQualifiedT> cv_limits;
 
+   // verify that the member has the same value as the same member
+   // of a specialization of numeric_limits on the cv-qualified T
 #  define TEST(member)                                                      \
       rw_assert (limits::member == cv_limits::member, 0, __LINE__,          \
                  "numeric_limits<%s>::%s == numeric_limits<%s %1$s>::%2$s", \
@@ -61,6 +67,9 @@
     typedef std::numeric_limits<UserType<T> > limits;
     typedef std::numeric_limits<CVQualifiedT> cv_limits;
 
+   // verify that the member has the same value as the same member
+   // of a specialization of numeric_limits on some user-defined T
+   // (i.e., the primary template)
 #  define TEST(member)                                                      \
       rw_assert (limits::member == cv_limits::member, 0, __LINE__,          \
                  "numeric_limits<%s>::%s == numeric_limits<%s %1$s>::%2$s", \
@@ -98,7 +107,13 @@
         TEST (signaling_NaN ());
     }
     else {
-        // test NaN
+        const bool expect = limits::has_quiet_NaN;
+
+        rw_assert (expect == (limits::quiet_NaN () != cv_limits::quiet_NaN ()),
+                   0, __LINE__,
+                   "numeric_limits<%s>::qNaN() %{?}!=%{:}==%{;} "
+                   "numeric_limits<%s %1$s>::qNaN ()",
+                   tname, expect, quals);
     }
 
     TEST (denorm_min ());
@@ -120,7 +135,8 @@
     typedef volatile T       volatile_T;
     typedef const volatile T const_volatile_T;
     
-    rw_info (0, 0, 0, "std::numeric_limits<T> with T = cv-qualified %s", tname);
+    rw_info (0, 0, __LINE__,
+             "std::numeric_limits<T> with T = cv-qualified %s", tname);
 
     test_limits ((T*)0, (const_T*)0, tname, "const");
     test_limits ((T*)0, (volatile_T*)0, tname, "volatile");
@@ -184,5 +200,5 @@
                     "specializations on cv-qualifed types",
                     run_test,
                     0,
-                    0);
+                    (void*)0);
 }
diff --git a/tests/support/18.setjmp.cpp b/tests/support/18.setjmp.cpp
new file mode 100644
index 0000000..788ab8b
--- /dev/null
+++ b/tests/support/18.setjmp.cpp
@@ -0,0 +1,106 @@
+/***************************************************************************
+ *
+ * 18.setjmp.cpp - test exercising [support.runtime], header <setjmp.h>
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
+#include <setjmp.h>
+#include <driver.h>
+
+/**************************************************************************/
+
+jmp_buf env;
+
+void test_longjmp (int arg)
+{
+    longjmp (env, arg);
+
+    rw_assert (0, 0, __LINE__,
+               "call to longjmp(..., %d) returned", arg);
+}
+
+/**************************************************************************/
+
+static int
+run_test (int, char**)
+{
+#ifdef longjmp
+
+    // longjmp must not be #defined as a macro
+    rw_assert (0, 0, __LINE__, "longjmp #defined as a macro");
+
+#endif   // longjmp
+
+#ifdef jmp_buf
+
+    //jmp_buf must not be #defined as a macro
+    rw_assert (0, 0, __LINE__, "jmp_buf #defined as a macro");
+
+#endif   // jmp_buf
+
+#ifndef setjmp
+
+    //setjmp must be #defined as a macro
+    rw_assert (0, 0, __LINE__, "macro setjmp not #defined");
+
+#endif   // setjmp
+
+    // verify that setjmp works
+    int arg = 1;
+    int result;
+
+    result = setjmp (env);
+
+    if (0 == result) {
+
+        test_longjmp (arg);
+
+        rw_assert (0, 0, __LINE__,
+                   "call to longjmp(..., %d) returned", arg);
+    }
+    else {
+        rw_assert (arg == result, 0, __LINE__,
+                   "longjmp(..., %d) returned %d from setjmp()",
+                   arg, result);
+
+        // repeat a couple more times
+        if (arg < 3)
+            test_longjmp (++arg);
+    }
+
+    return 0;
+}
+
+/**************************************************************************/
+
+int main (int argc, char *argv[])
+{
+    return rw_test (argc, argv, __FILE__,
+                    "support.runtime",
+                    "header <setjmp.h>",
+                    run_test,
+                    "",
+                    (void*)0);
+}
diff --git a/tests/support/atomic_xchg.cpp b/tests/support/atomic_xchg.cpp
index 7ef0b22..d0a2354 100644
--- a/tests/support/atomic_xchg.cpp
+++ b/tests/support/atomic_xchg.cpp
@@ -294,11 +294,15 @@
         }
     }
 
-    // compute the expected result
+    // compute the expected result, "skipping" zeros by incrementing
+    // expect twice when it overflows and wraps around to 0 (zero is
+    // used as the lock variable in thread_routine() above)
     intT expect = intT (1);
 
-    for (unsigned long i = 0; i != (Args::nthreads_ * Args::nincr_) / 2U; ++i) {
-        if (!++expect)
+    const unsigned long nincr = (Args::nthreads_ * Args::nincr_) / 2U;
+        
+    for (unsigned long i = 0; i != nincr; ++i) {
+        if (intT () == ++expect)
             ++expect;
     }
 
diff --git a/tests/utilities/20.temp.buffer.cpp b/tests/utilities/20.temp.buffer.cpp
index a429ac1..28db655 100644
--- a/tests/utilities/20.temp.buffer.cpp
+++ b/tests/utilities/20.temp.buffer.cpp
@@ -33,6 +33,10 @@
 #include <cstdio>      // for sprintf()
 #include <cstring>     // for memset()
 
+#ifdef _MSC_VER
+#  include <climits>     // for INT_MAX
+#endif
+
 #include <rw_new.h>
 #include <driver.h>
 
@@ -385,7 +389,7 @@
 struct MyStruct { };
 typedef void (MyStruct::*MemberPointer)();
 
-template <unsigned long N>
+template <std::size_t N>
 struct BigStruct { char dummy [N]; };
 
 /**************************************************************************/
@@ -440,12 +444,20 @@
 #if    (!defined (__IBMCPP__) || __IBMCPP__ > 700) \
     && !defined (__HP_aCC)
 
+#  ifndef _MSC_VER
+    const std::size_t MAX_SIZE = _RWSTD_PTRDIFF_MAX;
+#  else
+    // the MSVC and ICC/Windows has maximum size of
+    // the array equal to 0x7fffffff bytes
+    const std::size_t MAX_SIZE = INT_MAX;
+#  endif
+
     // avoid instantiating test on very large structs
     // to prevent failures (at compile or run-time) due
     // to compiler bugs
-    test_failure ((BigStruct<_RWSTD_PTRDIFF_MAX / 2>*)0, 0);
-    test_failure ((BigStruct<_RWSTD_PTRDIFF_MAX - 1>*)0, 0);
-    test_failure ((BigStruct<_RWSTD_PTRDIFF_MAX>*)0, 0);
+    test_failure ((BigStruct<MAX_SIZE / 2>*)0, 0);
+    test_failure ((BigStruct<MAX_SIZE - 1>*)0, 0);
+    test_failure ((BigStruct<MAX_SIZE>*)0, 0);
 
 #else
 
diff --git a/util/aliases.cpp b/util/aliases.cpp
index 17aeb46..8553cea 100644
--- a/util/aliases.cpp
+++ b/util/aliases.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -42,7 +42,7 @@
 #include <cstdio>
 #include <cstring>   // for memcpy(), strlen()
 #include <clocale>   // for setlocale()
-#include <locale>
+#include <locale>    // for tolower()
 #include <iostream>
 #include <string>
 #include <vector>
@@ -349,8 +349,8 @@
     std::string::const_iterator it1 = s1.begin ();
     std::string::const_iterator it2 = s2.begin ();
     for (; it1 != s1.end () && it2 != s2.end (); it1++, it2++)
-        if (std::tolower(*it1, std::locale ()) !=
-            std::tolower(*it2, std::locale ()))
+        if (   (std::tolower)(*it1, std::locale ())
+            != (std::tolower)(*it2, std::locale ()))
             return (*it1 - *it2);
 
     return 0;
diff --git a/util/charmap.cpp b/util/charmap.cpp
index 48db6a9..e92ef3b 100644
--- a/util/charmap.cpp
+++ b/util/charmap.cpp
@@ -22,7 +22,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -73,7 +73,7 @@
 // the numeric values cannot be greater then 3 digits long
 #define MAX_BYTE_LEN 5
 
-#ifndef _MSC_VER
+#ifndef _RWSTD_NO_ICONV
 
 static iconv_t
 my_iconv_open (const char *to_codeset, const char *from_codeset)
@@ -163,7 +163,7 @@
 }
 
 #  endif   // _RWSTD_NO_ISO_10646_WCHAR_T
-#endif  // _MSC_VER
+#endif   // _RWSTD_NO_ICONV
 
 
 // utf8_decode translates the UTF-8 encoded character (specified
@@ -433,20 +433,21 @@
 }
 
 
-#ifndef _MSC_VER
 char* Charmap::convert_to_utf8 (const char *inbuf, size_t inbuf_s, 
                                 char *outbuf, size_t outbuf_s) const
 {
+#ifndef _RWSTD_NO_ICONV
+
     if (ic_to_utf8_ == iconv_t (-1))
         return 0;
 
     char* outbufp = outbuf;
 
-#ifndef _RWSTD_NO_ICONV_CONST_CHAR
+#  ifndef _RWSTD_NO_ICONV_CONST_CHAR
     const char* inbufp = inbuf;
-#else
+#  else
     char* inbufp = _RWSTD_CONST_CAST(char*, inbuf);
-#endif   // _RWSTD_NO_ICONV_CONST_CHAR
+#  endif   // _RWSTD_NO_ICONV_CONST_CHAR
     
     if (std::size_t (-1) == 
         iconv (ic_to_utf8_, &inbufp, &inbuf_s, &outbufp, &outbuf_s)) {
@@ -460,8 +461,15 @@
     }
 
     return outbufp;
+
+#else   // if defined (_RWSTD_NO_ICONV)
+
+    return 0;
+
+#endif   // _RWSTD_NO_ICONV
+
 }
-#endif  // _MSC_VER
+
 
 
 std::string Charmap::get_charmap_name () const
@@ -643,7 +651,7 @@
 
     const unsigned long val = std::strtoul (&*++it, (char**)0, 16);
 
-    if (_RWSTD_WCHAR_T_MAX <= val)
+    if (_RWSTD_WCHAR_MAX <= val)
         issue_diag (E_UCS, true, 0, 
                     "UCS value %lu of symbolic character %s out of range.\n",
                     val, sym.c_str ());
@@ -988,10 +996,10 @@
        reverse_maps (create_reverse_maps),
        UCS4_internal_ (use_UCS4)
 {
-#ifndef _MSC_VER
+#ifndef _RWSTD_NO_ICONV
     ic_to_utf8_ = 0;
     ic_to_ext_ = 0;
-#endif  // _MSC_VER
+#endif   // _RWSTD_NO_ICONV
 
     scanner_.open (fname, '#', '\\');
 
@@ -1020,21 +1028,26 @@
 
             // we always need a iconv to utf8 so that we can create
             // the utf8_charmap unless we are on windows
-#if !defined (_MSC_VER)
+#ifndef _RWSTD_NO_ICONV
             if (!in_utf8_) {
                 ic_to_utf8_ = open_iconv_to_utf8 ();
 #  if !defined (_RWSTD_NO_ISO_10646_WCHAR_T)
                 ic_to_ext_ = open_iconv_to_ext ();
 #  endif   // _RWSTD_NO_ISO_10646_WCHAR_T
             }
-#else
+
+#else   // if defined (_RWSTD_NO_ICONV)
+
+#  ifdef _MSC_VER
             codepage_ = get_codepage (code_set_name_);
             if (codepage_ == 0) {
                 issue_diag (W_ICONV, false, 0, 
                             "iconv_open (%s to UTF-8) failed\n",
                             code_set_name_.c_str());
             }
-#endif     // _MSC_VER
+
+#  endif   // _MSC_VER
+#endif   // _RWSTD_NO_ICONV
 
             scanner_.ignore_line ();
             break;
diff --git a/util/charmap.h b/util/charmap.h
index f79bffb..3336259 100644
--- a/util/charmap.h
+++ b/util/charmap.h
@@ -22,24 +22,23 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 2001-2006 Rogue Wave Software.
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
 
-#ifndef _RWSTD_LOC_CHARMAP_H_INCLUDED
-#define _RWSTD_LOC_CHARMAP_H_INCLUDED
+#ifndef _RWSTD_CHARMAP_H_INCLUDED
+#define _RWSTD_CHARMAP_H_INCLUDED
 
 #include <string>
 #include <list>
 #include <map>
 #include <set>
 
-#ifndef _MSC_VER
-#  ifndef _RWSTD_NO_ICONV
-#    include <iconv.h>
-#  endif
-#endif  // _MSC_VER
+#ifndef _RWSTD_NO_ICONV
+#  include <iconv.h>
+#endif   // _RWSTD_NO_ICONV
+
 
 #include "scanner.h"
 
@@ -162,10 +161,10 @@
     // are defined in the character map
     void verify_portable_charset () const;
 
-#ifndef _MSC_VER
+#ifndef _RWSTD_NO_ICONV
     // open the iconv descriptor to convert to utf8
     iconv_t open_iconv_to_utf8 () const;
-#endif  // _MSC_VER
+#endif   // _RWSTD_NO_ICONV
 
     // convert a human-readable encoding of a character
     // to its raw multibyte character representation
@@ -175,13 +174,14 @@
     char* convert_to_utf8 (const char *inbuf, std::size_t inbuf_s, 
                            char *outbuf, std::size_t outbuf_s) const;
 
-#ifndef _MSC_VER
+#ifndef _RWSTD_NO_ICONV
 #  ifndef _RWSTD_NO_ISO_10646_WCHAR_T    
+
     // open the iconv descriptor to convert from utf8 to the external encoding
     iconv_t open_iconv_to_ext ();
 
 #  endif   // _RWSTD_NO_ISO_10646_WCHAR_T
-#endif  // _MSC_VER
+#endif   // _RWSTD_NO_ICONV
     
     // add the symbolic name of a character and the raw multibyte
     // character corresponding to it to the character maps
@@ -225,13 +225,13 @@
     // the number of bytes in the largest multi-byte value
     int mb_cur_max_;
 
-#ifndef _MSC_VER
+#ifndef _RWSTD_NO_ICONV
     // the iconv file descriptor that converts to utf8
     iconv_t ic_to_utf8_;
 
     // the iconv file descriptor that converts from utf8 to external
     iconv_t ic_to_ext_;
-#endif  // _MSC_VER
+#endif   // _RWSTD_NO_ICONV
 
     // the name of the character map file
     std::string charmap_name_;
@@ -260,5 +260,5 @@
 };
 
 
-#endif   // _RWSTD_LOC_CHARMAP_H_INCLUDED
+#endif   // _RWSTD_CHARMAP_H_INCLUDED
 
diff --git a/util/cmdopt.cpp b/util/cmdopt.cpp
index 938b1e2..c081dc6 100644
--- a/util/cmdopt.cpp
+++ b/util/cmdopt.cpp
@@ -72,7 +72,15 @@
 const char default_path_sep = '\\';
 const char suffix_sep = '.';
 const size_t exe_suffix_len = 4; /* strlen(".exe") == 4 */
-const float TICKS_PER_SEC = 10000000; /* 100 nanosecond units in a second */
+const float TICKS_PER_SEC = CLOCKS_PER_SEC;
+
+#  ifndef _WIN32_WINNT
+#    define _WIN32_WINNT 0x0500
+#  endif
+
+#  if _WIN32_WINNT >= 0x0500
+#    define RLIMIT_AS
+#  endif
 #endif
 
 static const char
@@ -81,6 +89,8 @@
     "\n"
     "  Treats each token in targets as the path to an executable. Each target\n"
     "  enumerated is executed, and the output is processed after termination.\n"
+    "  If target prepended by '@' character, target is treated as text file\n"
+    "  with list of targets (one target per line).\n"
     "  If the execution takes longer than a certain (configurable) amount of\n"
     "  time, the process is killed.\n"
     "\n"
@@ -345,8 +355,8 @@
 
                 /* determine whether the hard limit and/or the soft limit
                    should be set. */
-                const bool hard = isupper (arg [0]);
-                const bool soft = islower (arg [1]);
+                const bool hard = 0 != isupper (arg [0]);
+                const bool soft = 0 != islower (arg [1]);
 
                 arg += limits [i].len + 1;
 
@@ -495,11 +505,15 @@
     const char opt_signal[]   = "--signal";
     const char opt_sleep[]    = "--sleep";
     const char opt_ulimit[]   = "--ulimit";
+    const char opt_verbose[]  = "--verbose";
     const char opt_warn[]     = "--warn";
 
     int i;
 
     assert (0 != argv);
+    assert (0 != defaults);
+
+    memset (defaults, 0, sizeof (target_opts));
 
     /* The chain of preprocesor logic below initializes the defaults->c_warn 
        and defaults->l_warn values.
@@ -544,13 +558,15 @@
         char* end = 0;
 
         switch (argv [i][1]) {
-        case '?':
+        case '?':   /* display help and exit with status of 0 */
         case 'h':
             show_usage (0);
+
         case 'r':
             ++i; /* Ignore -r option (makefile compat) */
             break;
-        case 't':
+
+        case 't':   /* executable timeout in seconds */
             optname = opt_timeout;
             optarg  = get_short_val (argv, &i);
             if (optarg) {
@@ -567,19 +583,26 @@
 
             break;
 
-        case 'd':
+        case 'd':   /* directory containing example reference files */
             optname = opt_data_dir;
             defaults->data_dir = get_short_val (argv, &i);
             if (!defaults->data_dir)
                 missing_value (optname);
             break;
-        case 'x':
+
+        case 'v':   /* enable verbose mode */
+            optname = opt_verbose;
+            ++defaults->verbose;
+            break;
+
+        case 'x':   /* command line options to pass to targets */
             optname  = opt_t_flags;
             *exe_opts = get_short_val (argv, &i);
             if (!*exe_opts)
                 missing_value (optname);
             break;
-        case '-':
+
+        case '-':   /* long options */
         {
             const size_t arglen = strlen (argv [i]);
 
@@ -589,16 +612,19 @@
 
             if (   sizeof opt_compat - 1 == arglen
                 && !memcmp (opt_compat, argv [i], sizeof opt_compat)) {
+                /* enter compatibility mode */
                 defaults->compat = 1;
                 break;
             }
             else if (   sizeof opt_nocompat - 1 == arglen
                      && !memcmp (opt_nocompat, argv [i], sizeof opt_nocompat)) {
+                /* exit compatibility mode */
                 defaults->compat = 0;
                 break;
             }
             else if (   sizeof opt_exit - 1 <= arglen
                      && !memcmp (opt_exit, argv [i], sizeof opt_exit - 1)) {
+                /* exit immediately with the specified status */
                 optname = opt_exit;
                 optarg  = get_long_val (argv, &i, sizeof opt_exit - 1);
                 if (optarg && *optarg) {
@@ -613,12 +639,14 @@
             }
             else if (   sizeof opt_help - 1 == arglen
                      && !memcmp (opt_help, argv [i], sizeof opt_help - 1)) {
+                /* display help and exit with status of 0 */
                 optname = opt_help;
                 show_usage (0);
                 break;
             }
             else if (   sizeof opt_sleep - 1 <= arglen
                      && !memcmp (opt_sleep, argv [i], sizeof opt_sleep - 1)) {
+                /* sleep for the specified number of seconds */ 
                 optname = opt_sleep;
                 optarg  = get_long_val (argv, &i, sizeof opt_sleep - 1);
                 if (optarg && *optarg) {
@@ -635,6 +663,7 @@
             }
             else if (   sizeof opt_signal - 1 <= arglen
                      && !memcmp (opt_signal, argv [i], sizeof opt_signal - 1)) {
+                /* send ourselves the specified signal */
                 optname = opt_signal;
                 optarg  = get_long_val (argv, &i, sizeof opt_signal - 1);
                 if (optarg && *optarg) {
@@ -649,6 +678,7 @@
             }
             else if (   sizeof opt_ignore - 1 <= arglen
                      && !memcmp (opt_ignore, argv [i], sizeof opt_ignore - 1)) {
+                /* ignore the specified signal */
                 optname = opt_ignore;
                 optarg  = get_long_val (argv, &i, sizeof opt_ignore - 1);
                 if (optarg && *optarg) {
@@ -663,6 +693,7 @@
             }
             else if (   sizeof opt_ulimit - 1 <= arglen
                      && !memcmp (opt_ulimit, argv [i], sizeof opt_ulimit - 1)) {
+                /* set child process resource utilization limits */
                 optname = opt_ulimit;
                 optarg  = get_long_val (argv, &i, sizeof opt_ulimit - 1);
                 if (optarg && *optarg) {
@@ -673,6 +704,7 @@
             }
             else if (   sizeof opt_warn - 1 <= arglen
                      && !memcmp (opt_warn, argv [i], sizeof opt_warn - 1)) {
+                /* set compiler warning mode */
                 optname = opt_warn;
                 optarg  = get_long_val (argv, &i, sizeof opt_warn - 1);
                 if (optarg && *optarg) {
diff --git a/util/ctype.cpp b/util/ctype.cpp
index 291e008..8815632 100644
--- a/util/ctype.cpp
+++ b/util/ctype.cpp
@@ -55,7 +55,7 @@
 
     long w = std::strtol (t.name.substr (2, t.name.size ()).c_str (),
                                0, 16);
-    if (w > _RWSTD_WCHAR_T_MAX) {
+    if (w > _RWSTD_WCHAR_MAX) {
         // issue_diag intercepted in process_transliteration_statement
         // but will render -w switch useless; just throw here
         throw loc_exception ("symbol could not be converted to UCS-4 "
diff --git a/util/display.cpp b/util/display.cpp
index 79f6478..fe0a600 100644
--- a/util/display.cpp
+++ b/util/display.cpp
@@ -26,31 +26,156 @@
 
 #include <assert.h>
 #include <stdio.h>      /* for fflush(), printf(), puts(), ... */
+#include <string.h>     /* for strchr() */
 
 #include "cmdopt.h" /* for target_name -should this be moved? */
 #include "exec.h" /* for get_signame */
 
 #include "display.h"
+#include "target.h"   /* for target_status */
+
+
+/**
+   ProcessStatus enum lookup table for 'short' (6 character) strings.
+*/
+static const char* const
+short_st_name [ST_LAST] = {
+    "OK", /*ST_OK*/
+    "COMP", /*ST_COMPILE*/
+    "LINK", /*ST_LINK*/
+    "EXIST", /*ST_EXIST*/
+    "XPERM", /*ST_EXECUTE_FLAG*/
+    "EXEC", /*ST_EXECUTE*/
+    "NOUT", /*ST_NO_OUTPUT*/
+    "OUTPUT", /*ST_NO_REF*/
+    "BREF", /*ST_BAD_REF*/
+    "DIFF", /*ST_BAD_OUTPUT*/
+    "FORMAT", /*ST_FORMAT*/
+    "OFLOW", /*ST_OVERFLOW*/
+    "ERROR", /*ST_SYSTEM_ERROR*/
+    "KILLED", /*ST_KILLED*/
+    "NKILL" /*ST_NOT_KILLED*/
+};
+
+
+/**
+   ProcessStatus enum lookup table for descriptive strings.
+*/
+static const char* const
+verbose_st_name [ST_LAST] = {
+    "OK", /*ST_OK*/
+    "Program failed to compile.", /*ST_COMPILE*/
+    "Program failed to link.", /*ST_LINK*/
+    "Program executable not found.", /*ST_EXIST*/
+    "Program not executable.", /*ST_EXECUTE_FLAG*/
+    "Program failed to execute.", /*ST_EXECUTE*/
+    "Program generated no output.", /*ST_NO_OUTPUT*/
+    "Program reference output missing.", /*ST_NO_REF*/
+    "Bad reference.", /*ST_BAD_REF*/
+    "Program produced unexpected output.", /*ST_BAD_OUTPUT*/
+    "Program produced output in unexpected format.", /*ST_FORMAT*/
+    "Arithmetic overflow.", /*ST_OVERFLOW*/
+    "System error occurred.", /*ST_SYSTEM_ERROR*/
+    "Process killed after a timeout.", /*ST_KILLED*/
+    "Failed to kill process after a timeout." /*ST_NOT_KILLED*/
+};
+
+
+/**
+   Prints an argv array, quoting elelemnts containing spaces.
+*/
+static int
+print_argv (const char* const argv[], int newline)
+{
+    assert (0 != argv);
+
+    const char* const* parg = argv;
+
+    int nchars = 0;
+
+    for (parg = argv; *parg; ++parg) {
+
+        const char *fmt = "%s ";
+
+        if (strchr (*parg, ' '))
+            fmt = "\"%s\" ";
+
+        nchars += printf (fmt, *parg);
+    }
+
+    if (newline)
+        puts ("");
+
+    return nchars;
+}
+
 
 /**
    Generates output header, designed for text output and console viewing.
 */
-static void print_header_plain ()
+static void
+print_header_plain (const char* const argv[])
 {
+    (void)&argv;
+
     puts ("NAME                           STATUS WARN ASSERTS FAILED PERCNT"
           "    USER     SYS    REAL");
 }
 
+
+/**
+   Generates output header in verbose mode.
+*/
+static void
+print_header_verbose (const char* const argv[])
+{
+    print_argv (argv, 1 /* append newline */);
+}
+
+
+
 /**
    Generates target name listing, designed for text output and console viewing.
 */
-static void print_target_plain (const struct target_opts*)
+static void
+print_target_plain (const struct target_opts *defaults)
 {
     const char* const target_name = get_target ();
+
+    assert (0 == defaults->verbose);
+
     printf ("%-30.30s ", target_name);
+
+    /* flush to prevent killing a signal from not displaying the text */
     fflush (stdout);
 }
 
+
+/**
+   Generates target name listing, designed for text output and console viewing.
+*/
+static void
+print_target_verbose (const struct target_opts *defaults)
+{
+    assert (defaults->verbose);
+
+    printf ("%s ", "Executing \"");
+    print_argv (defaults->argv, 0 /* no newline */);
+
+    /* print stdin, stdout, and stderr redirections */
+    if (defaults->infname && *defaults->infname)
+        printf (" <%s", defaults->infname);
+
+    if (defaults->outfname && *defaults->outfname)
+        printf (" >%s 2>&1", defaults->outfname);
+
+    puts ("\"");
+
+    /* flush to prevent killing a signal from not displaying the text */
+    fflush (stdout);
+}
+
+
 /**
    Generates target result listing, designed for text output and console 
    viewing.
@@ -103,32 +228,122 @@
         puts ("");
 }
 
+
+/**
+   Generates verbose target result listing.
+*/
+static void
+print_status_verbose (const struct target_status* status)
+{
+    unsigned valid_timing;
+
+    assert (0 != status);
+    assert (ST_OK <= status->status && ST_LAST > status->status);
+
+    valid_timing = status->user && status->sys
+        && ST_NOT_KILLED != status->status;
+
+    if (status->status) /* if status is set, print it */
+        printf ("  Status: %s\n", verbose_st_name [status->status]);
+    else if (status->signaled) /* if exit signal is non-zero, print it */
+        printf ("  Process signalled:    %s\n", get_signame (status->exit));
+    else {
+        printf ("  Exit status:          %6d%s\n"
+                "  Compiler warnings:    %6u\n"
+                "  Linker warnings:      %6u\n"
+                "  Runtime warnings:     %6u\n",
+                status->exit, 0 == status->exit ? " (success)" : "",
+                status->c_warn,
+                status->l_warn,
+                status->t_warn);
+
+        /* Print assetions, if any registered */
+        if ((unsigned)-1 != status->assert && status->assert) {
+            printf ("  Failed assertions:    %6u\n"
+                    "  Total assertions:     %6u\n",
+                    status->failed, status->assert);
+        }
+    }
+
+    /* Print timings, if available */
+    if (valid_timing) {
+        const float wall = status->wall ? *status->wall / TICKS_PER_SEC : -1;
+        const float user = status->user ? *status->user / TICKS_PER_SEC : -1;
+        const float sys  = status->sys  ? *status->sys  / TICKS_PER_SEC : -1;
+
+        printf ("  Times:\n"
+                "    Real               %7.3fs\n"
+                "    User               %7.3fs\n"
+                "    Sys                %7.3fs\n",
+                wall, user, sys);
+    }
+
+    puts ("");
+}
+
+
 /**
    Placholder output footer function, unneeded for text output and console 
    viewing.
 */
-static void print_footer_plain () {}
+static void
+print_footer_plain (int count, const struct target_status *summary)
+{
+    printf ("PROGRAM SUMMARY:\n"
+            "  Programs:             %6d\n"
+            "  Non-zero exit status: %6d\n"
+            "  Signalled:            %6d\n"
+            "  Compiler warnings:    %6u\n"
+            "  Linker warnings:      %6u\n"
+            "  Runtime warnings:     %6u\n",
+            count,
+            summary->exit,
+            summary->signaled,
+            summary->c_warn,
+            summary->l_warn,
+            summary->t_warn);
 
-const char* const short_st_name [ST_LAST] = {
-    "OK", /*ST_OK*/
-    "COMP", /*ST_COMPILE*/
-    "LINK", /*ST_LINK*/
-    "EXIST", /*ST_EXIST*/
-    "XPERM", /*ST_EXECUTE_FLAG*/
-    "EXEC", /*ST_EXECUTE*/
-    "NOUT", /*ST_NO_OUTPUT*/
-    "OUTPUT", /*ST_NO_REF*/
-    "BREF", /*ST_BAD_REF*/
-    "DIFF", /*ST_BAD_OUTPUT*/
-    "FORMAT", /*ST_FORMAT*/
-    "OFLOW", /*ST_OVERFLOW*/
-    "ERROR", /*ST_SYSTEM_ERROR*/
-    "KILLED", /*ST_KILLED*/
-    "NKILL" /*ST_NOT_KILLED*/
-};
+    if ((unsigned)-1 != summary->assert) {
+        /* print assertion counters only when they're valid */
+        printf ("  Assertions:           %6u\n"
+                "  Failed assertions:    %6u\n",
+                summary->assert,
+                summary->failed);
+    }
+}
 
 
-void (*print_header) () = print_header_plain;
+static void
+print_footer_verbose (int count, const struct target_status *summary)
+{
+    print_footer_plain (count, summary);
+}
+
+
+/**
+   Sets the output functions referenced.
+*/
+void set_output_format (enum OutputFmt format)
+{
+    if (FMT_VERBOSE == format) {
+        print_header = print_header_verbose;
+        print_target = print_target_verbose;
+        print_status = print_status_verbose;
+        print_footer = print_footer_verbose;
+    }
+    else {
+        /* only two formats implemented */
+        assert (FMT_PLAIN == format);
+
+        print_header = print_header_plain;
+        print_target = print_target_plain;
+        print_status = print_status_plain;
+        print_footer = print_footer_plain;
+    }
+}
+
+
+void (*print_header) (const char* const[]) = print_header_plain;
 void (*print_target) (const struct target_opts*) = print_target_plain;
-void (*print_status) (const struct target_status* status)  = print_status_plain;
-void (*print_footer) () = print_footer_plain;
+void (*print_status) (const struct target_status*) = print_status_plain;
+void (*print_footer) (int, const struct target_status*) = print_footer_plain;
diff --git a/util/display.h b/util/display.h
index ed56ae4..00db951 100644
--- a/util/display.h
+++ b/util/display.h
@@ -43,11 +43,6 @@
 };
 
 /**
-   ProcessStatus enum lookup table for 'short' (6 character) strings.
-*/
-extern const char* const short_st_name [ST_LAST];
-
-/**
    Sets the output functions referenced.
 */
 void set_output_format (enum OutputFmt format);
@@ -62,7 +57,7 @@
 /**
    Prints the table preamble formatting, followed by the formatted header row.
 */
-extern void (*print_header) ();
+extern void (*print_header) (const char* const argv[]);
 
 /**
    Prints the formatted header column for a target row.
@@ -94,6 +89,7 @@
 /**
    Prints the closing formatting for the table.
 */
-extern void (*print_footer) ();
+extern void (*print_footer) (int count, const struct target_status* status);
+
 
 #endif   /* RW_DISPLAY_H */
diff --git a/util/exec.cpp b/util/exec.cpp
index c02d2e0..887e79d 100644
--- a/util/exec.cpp
+++ b/util/exec.cpp
@@ -45,8 +45,31 @@
 #    include <sys/resource.h> /* for setlimit(), RLIMIT_CORE, ... */
 #  endif
 #else
-#  include <windows.h> /* for PROCESS_INFORMATION, ... */
-#  include <process.h> /* for CreateProcess, ... */
+#  ifndef _WIN32_WINNT
+#    define _WIN32_WINNT 0x0500
+#  endif
+#  include <windows.h> /* for PROCESS_INFORMATION, CreateProcess, ... */
+#  ifndef SIGTRAP
+#    define SIGTRAP   5   // STATUS_BREAKPOINT translated into SIGTRAP
+#  endif
+#  ifndef SIGBUS
+#    define SIGBUS    10  // STATUS_IN_PAGE_ERROR translated into SIGBUS
+#  endif
+#  ifndef SIGSYS
+#    define SIGSYS    12  // STATUS_INVALID_PARAMETER translated into SIGSYS
+#  endif
+#  ifndef SIGSTKFLT
+#    define SIGSTKFLT 16  // STATUS_FLOAT_STACK_CHECK translated into SIGSTKFLT
+#  endif
+#  ifndef STATUS_INVALID_PARAMETER
+#    define STATUS_INVALID_PARAMETER          ((DWORD)0xC000000DL)
+#  endif
+#  ifndef STATUS_STACK_BUFFER_OVERRUN
+#    define STATUS_STACK_BUFFER_OVERRUN       ((DWORD)0xC0000409L)
+#  endif
+#  ifndef STATUS_INVALID_CRUNTIME_PARAMETER
+#    define STATUS_INVALID_CRUNTIME_PARAMETER ((DWORD)0xC0000417L)
+#  endif
 #endif
 #include <sys/stat.h> /* for S_* */
 #include <sys/types.h>
@@ -612,80 +635,6 @@
     }
 }
 
-/**
-   Opens an input file, based on exec_name
-
-   Takes a data directory and an executable name, and tries to open an input 
-   file based on these variables.  If a file is found in neither of two 
-   locattions derived from these variables, this method tries to fall back on 
-   /dev/null.
-
-   Source file locations:
-     - [data_dir]/manual/in/[exec_name].in
-     - [data_dir]/tutorial/in/[exec_name].in
-     - /dev/null
-
-   @param data_dir the path of the reference data directory
-   @param exec_name the name of executable being run
-   @returns the file descriptor of the opened file
-*/
-static int
-open_input (const char* data_dir, const char* exec_name)
-{
-    int intermit = -1;
-
-    assert (0 != exec_name);
-    assert (0 != data_dir);
-
-    if (strlen (data_dir)) {
-        char* tmp_name;
-
-        /* Try data_dir/manual/in/exec_name.in */
-        tmp_name = reference_name (data_dir, "manual", "in");
-        intermit = open (tmp_name, O_RDONLY);
-    
-        /* If we opened the file, return the descriptor */
-        if (0 <= intermit) {
-            free (tmp_name);
-            return intermit;
-        }
-
-        /* If the file exists (errno isn't ENOENT), exit */
-        if (ENOENT != errno)
-            terminate (1, "open (%s) failed: %s\n", tmp_name, 
-                       strerror (errno));
-
-        /* Try data_dir/tutorial/in/exec_name.in */
-        free (tmp_name);
-        tmp_name = reference_name (data_dir, "tutorial", "in");
-        intermit = open (tmp_name, O_RDONLY);
-
-        /* If we opened the file, return the descriptor */
-        if (0 <= intermit) {
-            free (tmp_name);
-            return intermit;
-        }
-
-        /* If the file exists (errno isn't ENOENT), exit */
-        if (-1 == intermit && ENOENT != errno)
-            terminate (1, "open (%s) failed: %s\n", tmp_name, 
-                       strerror (errno));
-
-        free (tmp_name);
-    }
-
-    /* If we didn't find a source file, open /dev/null */
-
-    intermit = open ("/dev/null", O_RDONLY);
-
-    /* If we opened the file, return the descriptor */
-    if (0 <= intermit)
-        return intermit;
-
-    /* otherwise, print an error message and exit */
-    terminate (1, "open (/dev/null) failed: %s\n", strerror (errno));
-    return -1; /* silence a compiler warning */
-}
 
 /**
    Replaces one file descriptor with a second, closing second after replacing
@@ -768,7 +717,7 @@
         { 0, 0, 0 }
     };
 
-    for (size_t i = 0; limits [i].limit; ++i) {
+    for (size_t i = 0; limits [i].name; ++i) {
         struct rlimit local;
 
         if (!limits [i].limit)
@@ -867,25 +816,23 @@
 
         /* Redirect stdin */
         {
-            const int intermit = open_input (options->data_dir, target_name);
+            const int intermit = open (options->infname, O_RDONLY);
             replace_file (intermit, 0, "stdin");
         }
 
         /* Redirect stdout */
         {
-            char* const tmp_name = output_name (options->argv [0]);
             int intermit;
 
-            intermit = open (tmp_name, O_WRONLY | O_CREAT | O_TRUNC, 
+            intermit = open (options->outfname,
+                             O_WRONLY | O_CREAT | O_TRUNC, 
                              S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 
             if (-1 == intermit)
                 terminate (1, "Error opening %s for output redirection: "
-                           "%s\n", tmp_name, strerror (errno));
+                           "%s\n", options->outfname, strerror (errno));
 
             replace_file (intermit, 1, "stdout");
-
-            free (tmp_name);
         }
 
         /* Redirect stderr */
@@ -922,69 +869,32 @@
     }
 }
 #else  /* _WIN{32,64} */
-/**
-   Opens an input file, based on exec_name, using the child_sa security 
-   setting.
 
-   Takes a data directory, an executable name and security setting, and tries 
-   to open an input file based on these variables.
-   If a file is found in neither of two locations derived from these 
-   variables, or if data_dir is a null string, it returns null.
-   If a file system error occurs when opening a file, INVALID_HANDLE_VALUE
-   is returned (and should be checked for).
+// map between NT_STATUS value and corresponding UNIX signal
+static const struct {
+    DWORD nt_status;
+    int   signal;
+} nt_status_map [] = {
+    { STATUS_BREAKPOINT,                 SIGTRAP   },
+    { STATUS_ACCESS_VIOLATION,           SIGSEGV   },
+    { STATUS_STACK_OVERFLOW,             SIGSEGV   },
+    { STATUS_STACK_BUFFER_OVERRUN,       SIGSEGV   },
+    { STATUS_IN_PAGE_ERROR,              SIGBUS    },
+    { STATUS_ILLEGAL_INSTRUCTION,        SIGILL    },
+    { STATUS_PRIVILEGED_INSTRUCTION,     SIGILL    },
+    { STATUS_FLOAT_DENORMAL_OPERAND,     SIGFPE    },
+    { STATUS_FLOAT_DIVIDE_BY_ZERO,       SIGFPE    },
+    { STATUS_FLOAT_INEXACT_RESULT,       SIGFPE    },
+    { STATUS_FLOAT_INVALID_OPERATION,    SIGFPE    },
+    { STATUS_FLOAT_OVERFLOW,             SIGFPE    },
+    { STATUS_FLOAT_UNDERFLOW,            SIGFPE    },
+    { STATUS_INTEGER_DIVIDE_BY_ZERO,     SIGFPE    },
+    { STATUS_INTEGER_OVERFLOW,           SIGFPE    },
+    { STATUS_FLOAT_STACK_CHECK,          SIGSTKFLT },
+    { STATUS_INVALID_PARAMETER,          SIGSYS    },
+    { STATUS_INVALID_CRUNTIME_PARAMETER, SIGSYS    }
+};
 
-   Source file locations:
-     - [data_dir]/manual/in/[exec_name].in
-     - [data_dir]/tutorial/in/[exec_name].in
-
-   @param data_dir the path of the reference data directory
-   @param exec_name the name of executable being run
-   @param child_sa pointer to a SECURITY_ATTRIBUTES    structure
-   @returns the file descriptor of the opened file
-*/
-static HANDLE
-open_input (const char* data_dir, const char* exec_name, 
-            SECURITY_ATTRIBUTES* child_sa)
-{
-    HANDLE intermit;
-    DWORD error;
-    char* tmp_name;
-
-    assert (0 != exec_name);
-    assert (0 != data_dir);
-    assert (0 != child_sa);
-
-    if (!strlen (data_dir)) 
-        return 0;
-
-    /* Try data_dir\manual\in\exec_name.in */
-    tmp_name = reference_name (data_dir, "manual", "in");
-
-    intermit = CreateFile (tmp_name, GENERIC_READ, FILE_SHARE_READ, child_sa, 
-        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-    error = GetLastError ();
-    /* If we found the file, return the descriptor */
-    if (INVALID_HANDLE_VALUE != intermit || (2 != error && 3 != error)) {
-        free (tmp_name);
-        return intermit;
-    }
-
-    /* Try data_dir\tutorial\in\exec_name.in */
-    free (tmp_name);
-    tmp_name = reference_name (data_dir, "tutorial", "in");
-    intermit = CreateFile (tmp_name, GENERIC_READ, FILE_SHARE_READ, child_sa, 
-        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-    /* If we didn't find the file, null out the handle to return */
-    error = GetLastError ();
-    if (INVALID_HANDLE_VALUE == intermit && (2 == error || 3 == error)) {
-        intermit = 0;
-    }
-
-    free (tmp_name);
-    return intermit;
-}
 
 /**
    Convert an argv array into a string that can be passed to CreateProcess.
@@ -1117,6 +1027,15 @@
         warn_last_error ("Waiting for child process");
 }
 
+/* FILETIME to ULONGLONG */
+inline ULONGLONG fttoull (const FILETIME& ft)
+{
+    ULARGE_INTEGER __ft;
+    __ft.LowPart  = ft.dwLowDateTime;
+    __ft.HighPart = ft.dwHighDateTime;
+    return __ft.QuadPart;
+}
+
 void exec_file (const struct target_opts* options, struct target_status* result)
 {
     char* merged;
@@ -1141,9 +1060,8 @@
     /* Create I/O handles */
     {
         /* Output redirection */
-        char* const tmp_name = output_name (options->argv [0]);
 
-        context.hStdOutput = CreateFile (tmp_name, GENERIC_WRITE, 
+        context.hStdOutput = CreateFile (options->outfname, GENERIC_WRITE, 
                 FILE_SHARE_WRITE, &child_sa, CREATE_ALWAYS, 
                 FILE_ATTRIBUTE_NORMAL, NULL);
         if (INVALID_HANDLE_VALUE == context.hStdOutput) { 
@@ -1153,11 +1071,12 @@
         }
 
         context.hStdError = context.hStdOutput;
-        free (tmp_name);
 
         /* Input redirection */
-        context.hStdInput = open_input (options->data_dir, get_target (), 
-                                        &child_sa);
+        context.hStdInput =
+            CreateFile (options->infname, GENERIC_READ, FILE_SHARE_READ, 
+                        &child_sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
         if (INVALID_HANDLE_VALUE == context.hStdInput) { 
             CloseHandle (context.hStdOutput);
             result->status = ST_SYSTEM_ERROR;
@@ -1174,12 +1093,9 @@
     UINT old_mode = SetErrorMode (SEM_FAILCRITICALERRORS
                                 | SEM_NOGPFAULTERRORBOX);
 
-    /* Check the wall clock before creating the process */
-    GetSystemTimeAsFileTime(&start);
-
-    /* Create the child process */
+    /* Create the child process in suspended state */
     if (0 == CreateProcess (options->argv [0], merged, 0, 0, 1, 
-        CREATE_NEW_PROCESS_GROUP, 0, 0, &context, &child)) {
+        CREATE_NEW_PROCESS_GROUP | CREATE_SUSPENDED, 0, 0, &context, &child)) {
         /* record the status if we failed to create the process */
         result->status = ST_SYSTEM_ERROR;
         warn_last_error ("Creating child process");;
@@ -1202,6 +1118,41 @@
     if (ST_SYSTEM_ERROR == result->status)
         return;
 
+#if _WIN32_WINNT >= 0x0500
+    if (options->as) {
+        if (HANDLE hJob = CreateJobObject (NULL, NULL)) {
+            if (AssignProcessToJobObject (hJob, child.hProcess)) {
+                JOBOBJECT_EXTENDED_LIMIT_INFORMATION job_info = { 0 };
+                
+                job_info.BasicLimitInformation.LimitFlags =
+                    JOB_OBJECT_LIMIT_PROCESS_MEMORY;
+                
+                const rw_rlimit* as = options->as;
+                job_info.ProcessMemoryLimit =
+                    as->rlim_cur < as->rlim_max ? as->rlim_cur : as->rlim_max;
+
+                if (!SetInformationJobObject (hJob,
+                                              JobObjectExtendedLimitInformation,
+                                              &job_info, sizeof (job_info)))
+                    warn_last_error ("Setting process limits");
+            }
+            else 
+                warn_last_error ("Assigning process to job object");
+
+            if (!CloseHandle (hJob))
+                warn_last_error ("Closing job object handle");
+        }
+        else
+            warn_last_error ("Creating job object");
+    }
+#endif   // _WIN32_WINNT >= 0x0500
+
+    /* Check the wall clock before resuming the process */
+    GetSystemTimeAsFileTime(&start);
+
+    if (DWORD (-1) == ResumeThread (child.hThread))
+        warn_last_error ("Resuming process");
+
     if (0 == CloseHandle (child.hThread))
         warn_last_error ("Closing child main thread handle");
 
@@ -1225,9 +1176,27 @@
     /* Calculate wall clock time elapsed while the process ran */
     GetSystemTimeAsFileTime(&end);
 
-    /* We're ignoring dwHighDateTime, as it's outside the percision of clock_t 
-     */
-    wall = end.dwLowDateTime - start.dwLowDateTime;
+    /* 100 nanosecond units in a second */
+    const DWORD UNITS_PER_SEC = 10000000;
+    const DWORD UNITS_PER_CLOCK = UNITS_PER_SEC / CLOCKS_PER_SEC;
+    assert (UNITS_PER_CLOCK * CLOCKS_PER_SEC == UNITS_PER_SEC);
+
+#if _WIN32_WINNT >= 0x0500
+    FILETIME stime, utime;
+    static clock_t user, sys;
+    if (GetProcessTimes (child.hProcess, &start, &end, &stime, &utime)) {
+        user = clock_t (fttoull (utime) / UNITS_PER_CLOCK);
+        sys  = clock_t (fttoull (stime) / UNITS_PER_CLOCK);
+
+        /* Link the delta */
+        result->user = &user;
+        result->sys  = &sys;
+    }
+    else
+        warn_last_error ("Getting child process times");
+#endif  // _WIN32_WINNT >= 0x0500
+
+    wall = clock_t ((fttoull (end) - fttoull (start)) / UNITS_PER_CLOCK);
 
     /* Link the delta */
     result->wall = &wall;
@@ -1240,9 +1209,12 @@
     if (0 == CloseHandle (child.hProcess))
         warn_last_error ("Closing child process handle");
 
-    if (STATUS_ACCESS_VIOLATION == result->exit) {
-        result->exit = SIGSEGV;
-        result->signaled = 1;
+    for (int i = 0; i < sizeof (nt_status_map) / sizeof (*nt_status_map); ++i) {
+        if (nt_status_map [i].nt_status == DWORD (result->exit)) {
+            result->exit = nt_status_map [i].signal;
+            result->signaled = 1;
+            break;
+        }
     }
 }
 
diff --git a/util/gencat.cpp b/util/gencat.cpp
new file mode 100644
index 0000000..994e60c
--- /dev/null
+++ b/util/gencat.cpp
@@ -0,0 +1,170 @@
+/***************************************************************************
+ *
+ * gencat.cpp - Utility for generating message catalogs on Windows
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ **************************************************************************/
+
+#include <cstdlib>   // for system(), getenv()
+#include <cstdio>    // for printf()
+#include <cstring>   // for strcmp(), strrchr()
+#include <cstddef>   // for size_t
+
+#include <string>
+
+static const char
+usage_text[] = {
+    "Usage: %s OUTPUT-FILE INPUT-FILE\n"
+    "Generate message catalog.\n"
+    "\n"
+    "  -?, --help                 Give this help list\n"
+};
+
+#ifdef _WIN32
+#  define SLASH '\\'
+
+// replace file extension in str by new extension ext
+static void change_ext (std::string& str, const char* ext)
+{
+    const std::string::size_type npos = std::string::npos;
+    std::string::size_type dot_pos = str.find_last_of ('.');
+    std::string::size_type quote_pos =
+        npos == dot_pos ? str.find_last_of ('\"')
+        : str.find_first_of ('\"', dot_pos);
+    if (npos == quote_pos)
+        quote_pos = str.size ();
+    if (npos == dot_pos)
+        dot_pos = quote_pos;
+    str.replace (dot_pos, quote_pos - dot_pos, ext);
+}
+
+#else    // !_WIN32
+#  define SLASH '/'
+#endif   // _WIN32
+
+int main (int argc, char *argv[])
+{
+    const char* exe_name = std::strrchr (argv [0], SLASH);
+    if (exe_name)
+        ++exe_name;
+    else
+        exe_name = argv [0];
+
+    if (1 == argc) {
+        std::printf (usage_text, exe_name);
+        return 0;
+    }
+
+    --argc;
+
+    while (0 != *++argv && 0 < argc-- && '-' == **argv) {
+
+        switch (*++*argv) {
+
+        case '?':
+            std::printf (usage_text, exe_name);
+            return 0;
+
+        case '-':
+            if (0 == std::strcmp (*argv, "-help")) {
+                std::printf (usage_text, exe_name);
+                return 0;
+            }
+
+            // fall through...
+        default:
+            std::printf ("%s: invalid option -%s\n",
+                         exe_name, *argv);
+            return 1;
+        }
+    }
+
+    if (1 > argc) {
+        std::printf ("%s: missing arguments\n Try '%s --help'\n",
+                     exe_name, exe_name);
+        return 1;
+    }
+
+    std::string cmd;
+
+#ifdef _WIN32
+
+#  ifndef _WIN64
+#    define PLATFORM "X86"
+#  else   // _WIN64
+#    define PLATFORM "X64"
+#  endif  // _WIN64
+
+    const char* const env_vars [] = {
+        "VS90COMNTOOLS", "VS80COMNTOOLS",
+        "VS71COMNTOOLS", "VSCOMNTOOLS"
+    };
+
+    for (size_t i = 0; i < sizeof (env_vars) / sizeof (*env_vars); ++i) {
+        if (const char* vcvarspath = std::getenv (env_vars [i])) {
+            cmd = vcvarspath;
+            cmd += "vsvars32.bat";
+            break;
+        }
+    }
+
+    if (std::string::npos != cmd.find (' ')) {
+        cmd.insert (cmd.begin (), 1, '\"');
+        cmd.push_back ('\"');
+    }
+
+    const char* const dll_name = argv [0];
+    const char* const rc_name = argv [1];
+
+    std::string res_name (rc_name);
+    change_ext (res_name, ".res");
+
+    if (!cmd.empty ())
+        cmd += " && ";
+
+    cmd += "rc ";
+    cmd += rc_name;
+    cmd += " && link /NOLOGO /DLL /NOENTRY /MACHINE:" PLATFORM " /OUT:";
+    cmd += dll_name;
+    cmd += ' ';
+    cmd += res_name;
+    
+    const int ret = std::system (cmd.c_str ());
+
+    std::remove (res_name.c_str ());
+
+#else    // !_WIN32
+
+    const char* const cat_name = argv [0];
+    const char* const msg_name = argv [1];
+
+    cmd = "/usr/bin/gencat ";
+    cmd += cat_name;
+    cmd += ' ';
+    cmd += msg_name;
+
+    const int ret = std::system (cmd.c_str ());
+
+#endif   // _WIN32
+
+    return ret;
+}
diff --git a/util/locale.cpp b/util/locale.cpp
index 48db410..bacc7a4 100644
--- a/util/locale.cpp
+++ b/util/locale.cpp
@@ -34,6 +34,14 @@
 #include <rw/_defs.h>
 #include _RWSTD_SYS_TYPES_H
 
+#if _RWSTD_PATH_SEP == '/'
+#  define SLASH      "/"
+#  define LS_1       "ls -1 "
+#else
+#  define SLASH      "\\"
+#  define LS_1       "dir /B /A:D"
+#endif
+
 #ifndef _MSC_VER
 #  include <sys/mman.h>   // for mmap()
 #  include <unistd.h>     // for close ()
@@ -2362,7 +2370,7 @@
     const char* const locale_root = std::getenv ("RWSTD_LOCALE_ROOT");
 
     if (0 != locale_root) {
-        const std::string cmd = std::string ("ls -1 ") + locale_root;
+        const std::string cmd = std::string (LS_1) + locale_root;
 
         std::system (cmd.c_str ());
     }
@@ -2377,7 +2385,7 @@
 
     if (0 != locale_root) {
         const std::string cmd =
-            std::string ("ls -1 ") + locale_root + "/charmaps";
+            std::string (LS_1) + locale_root + SLASH "charmaps";
 
         std::system (cmd.c_str());
     }
diff --git a/util/output.cpp b/util/output.cpp
index 9898114..d8aa62a 100644
--- a/util/output.cpp
+++ b/util/output.cpp
@@ -342,7 +342,7 @@
         status->status = ST_NO_OUTPUT;
     }
     else {
-        if (!strlen (options->data_dir)) {
+        if (0 == options->data_dir || '\0' == *options->data_dir) {
             /* If there is not an input directory, look at the assertion tags */
 
             if (!options->compat)
diff --git a/util/path.h b/util/path.h
index b295e86..84949d9 100644
--- a/util/path.h
+++ b/util/path.h
@@ -1,3 +1,31 @@
+/**************************************************************************
+ *
+ * path.h
+ *
+ * $Id$
+ *
+ ***************************************************************************
+ *
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  License); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
+ *
+ * Copyright 2001-2007 Rogue Wave Software, Inc.
+ * 
+ **************************************************************************/
+
 #ifndef RWSTD_PATH_H_INCLUDED
 #define RWSTD_PATH_H_INCLUDED
 
diff --git a/util/runall.cpp b/util/runall.cpp
index 99d8a1b..7ab1aab 100644
--- a/util/runall.cpp
+++ b/util/runall.cpp
@@ -31,13 +31,11 @@
 #include <stdio.h>      /* for FILE, fopen(), ... */
 
 #include <ctype.h>      /* for isspace */
+#include <limits.h>     /* for PATH_MAX */
 #include <sys/types.h>
 #include <sys/stat.h>
 #if !defined (_WIN32) && !defined (_WIN64)
 #  include <sys/wait.h>   /* for WIFEXITED(), ... */
-#else
-#  include <signal.h>     /* for SIGSEGV */
-#  include <windows.h>    /* for STATUS_ACCESS_VIOLATION */
 #endif
 
 #include "cmdopt.h"
@@ -64,6 +62,12 @@
 #  define S_IXOTH 0001
 #endif   /* S_IXOTH */
 
+#if !defined (PATH_MAX) || PATH_MAX < 128 || 4096 < PATH_MAX
+   // deal  with undefined, bogus, or excessive values
+#  undef  PATH_MAX
+#  define PATH_MAX   1024
+#endif
+
 /**
    Utility function to rework the argv array
 
@@ -90,7 +94,7 @@
    @return processed argv array, usable in exec ()
 */
 static char**
-merge_argv (char* const target, char* const argv [])
+merge_argv (const char* target, char* const argv [])
 {
     size_t tlen;
     char ** split;
@@ -423,7 +427,9 @@
    @see process_results
 */
 static void
-run_target (char* target, const struct target_opts *target_template)
+run_target (struct target_status     *summary,
+            const char               *target,
+            const struct target_opts *target_template)
 {
     struct target_opts options;
     struct target_status results;
@@ -435,6 +441,7 @@
     memcpy (&options, target_template, sizeof options);
     memset (&results, 0, sizeof results);
 
+    /* create the argv array for this target */
     options.argv = merge_argv (target, options.argv);
 
     assert (0 != options.argv);
@@ -442,6 +449,10 @@
 
     target_name = rw_basename (options.argv [0]);
 
+    /* create the names of files to redirect stdin and stdout */
+    options.infname  = input_name (options.data_dir, target_name);
+    options.outfname = output_name (options.argv [0]);
+
     print_target (&options);
 
     if (check_target_ok (options.argv [0], &results)) {
@@ -452,10 +463,31 @@
 
     print_status (&results);
 
+    if (summary) {
+        /* increment summary counters */
+        if (0 == results.signaled && results.exit)
+            ++summary->exit;
+
+        summary->signaled += results.signaled;
+        summary->c_warn   += results.c_warn;
+        summary->l_warn   += results.l_warn;
+        summary->t_warn   += results.t_warn;
+
+        if ((unsigned)-1 != results.assert) {
+            /* increment assertion counters only when they're valid */
+            summary->assert += results.assert;
+            summary->failed += results.failed;
+        }
+    }
+
+    /* free data dynamically allocated for this target alone */
     free (options.argv [0]);
     free (options.argv);
+    free ((char*)options.infname);
+    free ((char*)options.outfname);
 }
 
+
 /**
    Entry point to the application.
 
@@ -472,12 +504,9 @@
 {
     struct target_opts target_template;
     const char* exe_opts = "";
+    const char* const* const saved_argv = (const char* const*)argv;
 
     exe_name = argv [0];
-    memset (&target_template, 0, sizeof target_template);
-
-    target_template.timeout = 10;
-    target_template.data_dir = "";
 
     if (1 < argc && '-' == argv [1][0]) {
         const int nopts =
@@ -490,23 +519,76 @@
         argv += nopts;
     }
     else {
+        /* initialize data members */
+        memset (&target_template, 0, sizeof target_template);
+
         --argc;
         ++argv;
     }
 
+    /* set the program output mode */
+    if (target_template.verbose)
+        set_output_format (FMT_VERBOSE);
+    else
+        set_output_format (FMT_PLAIN);
+
     if (0 < argc) {
         int i;
         target_template.argv = split_opt_string (exe_opts);
 
         assert (0 != target_template.argv);
 
-        print_header ();
+        /* print out the program's argv array in verbose mode */
+        print_header (target_template.verbose ? saved_argv : 0);
+
+        struct target_status summary;
+        memset (&summary, 0, sizeof summary);
+
+        /* number of program's executed */
+        int progs_count = 0;
 
         for (i = 0; i < argc; ++i) {
-            run_target (argv [i], &target_template);
+            const char* target = argv [i];
+
+            if ('@' == target [0]) {
+                /* read targets from specified file */
+                const char* lst_name = target + 1;
+                FILE* lst = fopen (lst_name, "r");
+                if (0 == lst) {
+                    warn ("Error opening %s: %s\n", lst_name, strerror (errno));
+                    break;
+                }
+
+                while (!feof (lst)) {
+                    char buf [PATH_MAX];
+                    target = fgets (buf, sizeof (buf), lst);
+
+                    if (ferror (lst)) {
+                        warn ("Error reading %s: %s\n", lst_name, strerror (errno));
+                        break;
+                    }
+
+                    if (target) {
+                        /* remove terminating newline character if present */
+                        assert (buf == target);
+                        if (char* pos = strchr (buf, '\n'))
+                            *pos = '\0';
+                        if (*target) {
+                            ++progs_count;
+                            run_target (&summary, target, &target_template);
+                        }
+                    }
+                }
+
+                fclose (lst);
+            }
+            else {
+                ++progs_count;
+                run_target (&summary, target, &target_template);
+            }
         }
 
-        print_footer ();
+        print_footer (progs_count, &summary);
 
         if (target_template.argv [0])
             free (target_template.argv [0]);
diff --git a/util/target.h b/util/target.h
index 1c88a9f..6dbf75f 100644
--- a/util/target.h
+++ b/util/target.h
@@ -78,7 +78,10 @@
     const char* data_dir; /**< Root dir for reference input/output files. */
     const char* c_warn; /**< Warning flag string when compiling. */
     const char* l_warn; /**< Warning flag string when linking. */
+    const char* infname; /**< Input file to redirect stdin from. */
+    const char* outfname; /**< Output file to redirect stdout to. */
     int compat; /**< Test suite compatability mode switch. */
+    int verbose; /**< Verbose mode. */
     rw_rlimit* core;
     rw_rlimit* cpu;
     rw_rlimit* data;
diff --git a/util/util.cpp b/util/util.cpp
index 51e5433..0ce6ff1 100644
--- a/util/util.cpp
+++ b/util/util.cpp
@@ -1,22 +1,26 @@
 /************************************************************************
  *
- * util.cpp - Utility function definitions for the runall utility
+ * util.cpp - Utility function definitions for the exec utility
  *
  * $Id$
  *
  ************************************************************************
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software  Foundation (ASF) under one or more
+ * contributor  license agreements.  See  the NOTICE  file distributed
+ * with  this  work  for  additional information  regarding  copyright
+ * ownership.   The ASF  licenses this  file to  you under  the Apache
+ * License, Version  2.0 (the  "License"); you may  not use  this file
+ * except in  compliance with the License.   You may obtain  a copy of
+ * the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the  License is distributed on an  "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY  KIND, either  express or
+ * implied.   See  the License  for  the  specific language  governing
+ * permissions and limitations under the License.
  * 
  **************************************************************************/
 
@@ -26,12 +30,22 @@
 #include <stdlib.h> /* for exit, malloc */
 #include <stdarg.h> /* for va_* */
 #include <string.h> /* for strerror */
+
+#include <sys/stat.h> /* for stat() */
 #include <sys/types.h> /* for size_t */
 
 #include "cmdopt.h" /* for exe_name, target_name */
 
 #include "util.h"
 
+
+#ifdef _WIN32
+#  define DEV_NULL   "NUL:"
+#else
+#  define DEV_NULL   "/dev/null"
+#endif   // _WIN32
+
+
 void
 warn (const char* const format, ...)
 {
@@ -114,12 +128,11 @@
     char* tail;
     const char* const target_name = get_target ();
 
-    assert (0 != data_dir);
     assert (0 != target_name);
     assert (0 != subdir);
     assert (0 != mode);
 
-    root_len = strlen (data_dir);
+    root_len = data_dir ? strlen (data_dir) : 0;
     cmp_len = strlen (target_name) - exe_suffix_len;
     dir_len = strlen (subdir);
     mode_len = strlen (mode);
@@ -147,6 +160,61 @@
     return ref_name;
 }
 
+
+/**
+   Composes the name of an input file, based on target
+
+   Takes a data directory and an executable name, and tries to open an input 
+   file based on these variables.  If a file is found in neither of two 
+   locattions derived from these variables, this method tries to fall back on 
+   /dev/null.
+
+   Source file locations:
+     - [data_dir]/manual/in/[target].in
+     - [data_dir]/tutorial/in/[target].in
+     - /dev/null
+
+   @param data_dir the path of the reference data directory
+   @param target the name of executable being run
+   @returns the name of the file
+*/
+char*
+input_name (const char* data_dir, const char* target)
+{
+    char* fname = 0;
+    int stat_result = 0;
+    struct stat sb;
+
+    assert (0 != target);
+
+    if (data_dir && *data_dir) {
+
+        /* Try data_dir/manual/in/target.in */
+        fname       = reference_name (data_dir, "manual", "in");
+        stat_result = stat (fname, &sb);
+    
+        if (0 == stat_result)
+            return fname;
+
+        free (fname);
+
+        /* Try data_dir/tutorial/in/target.in */
+        fname       = reference_name (data_dir, "tutorial", "in");
+        stat_result = stat (fname, &sb);
+
+        if (0 == stat_result)
+            return fname;
+
+        free (fname);
+    }
+
+    /* If we didn't find a source file, use /dev/null */
+    fname = (char*)RW_MALLOC (sizeof DEV_NULL);
+    strcpy (fname, DEV_NULL);
+    return fname;
+}
+
+
 char*
 output_name (const char* target)
 {
diff --git a/util/util.h b/util/util.h
index f50467c..0bd47f6 100644
--- a/util/util.h
+++ b/util/util.h
@@ -89,6 +89,26 @@
                       const char* mode);
 
 /**
+   Composes the name of an input file, based on exec_name
+
+   Takes a data directory and an executable name, and tries to open an input 
+   file based on these variables.  If a file is found in neither of two 
+   locattions derived from these variables, this method tries to fall back on 
+   /dev/null.
+
+   Source file locations:
+     - [data_dir]/manual/in/[exec_name].in
+     - [data_dir]/tutorial/in/[exec_name].in
+     - /dev/null
+
+   @param data_dir the path of the reference data directory
+   @param exec_name the name of executable being run
+   @returns the name of the file
+*/
+char* input_name (const char* data_dir, const char* target);
+
+
+/**
    Generates the name of the output file for the executable target.
 
    This function allocates memory which is to be freed by the caller.
@@ -97,4 +117,5 @@
    @return translation of 'target.out'
 */
 char* output_name (const char* target);
+
 #endif   /* RW_UTIL_H */