2006-03-02 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD-->generics-branch for the period between
	the 0.20 release and the tag generics-merge-20050225.

1 files changed, 46 insertions, 0 deletions

diff --git a/LICENSE b/LICENSE
index a01ea5086..44620dcef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -312,3 +312,49 @@ maintained by Doug Lea and distributed under the following terms:
 CopyOnWriteArrayList.java has been reimplemented for GNU Classpath,
 and is distributed under the same terms as other GNU Classpath files,
 as specified at the top of this file.
+
+Directory external/relaxngDatatype
+RELAX NG Pluggable Datatype Libraries. All files are distributed under
+the following notice:
+
+        Copyright (c) 2001, Thai Open Source Software Center Ltd, Sun
+        Microsystems. All rights reserved.
+
+        Redistribution and use in source and binary forms, with or
+        without
+        modification, are permitted provided that the following
+        conditions are met:
+
+            Redistributions of source code must retain the above
+        copyright
+            notice, this list of conditions and the following
+        disclaimer.
+
+            Redistributions in binary form must reproduce the above
+            copyright notice, this list of conditions and the following
+            disclaimer in the documentation and/or other materials
+        provided
+            with the distribution.
+
+            Neither the names of the copyright holders nor the names of
+        its
+            contributors may be used to endorse or promote products
+        derived
+            from this software without specific prior written
+        permission.
+
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+        CONTRIBUTORS
+        "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+        NOT
+        LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+        FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+        SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+        INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+        SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+        BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+        LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+        THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+        SUCH DAMAGE.