2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of generics-branch to HEAD (woohoo!)

1 files changed, 13 insertions, 1 deletions

diff --git a/LICENSE b/LICENSE
index ae2588d44..44620dcef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -299,6 +299,19 @@ terms:
  above copyright notice and this permission notice are included in
  all copies or substantial portions of the software.
 
+The files in java/util/concurrent and subdirectories (with the
+exception of CopyOnWriteArrayList.java), along with
+java.util.NavigableMap, java.util.NavigableSet, java.util.Deque and
+java.util.ArrayDeque, are taken from JSR166 concurrency materials
+maintained by Doug Lea and distributed under the following terms:
+
+ Written by Doug Lea with assistance from members of JCP JSR-166
+ Expert Group and released to the public domain, as explained at
+ http://creativecommons.org/licenses/publicdomain
+ 
+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
@@ -345,4 +358,3 @@ the following notice:
         (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
         THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
         SUCH DAMAGE.
-