hal: Branch 'master'

[David Zeuthen]

 COPYING |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

New commits:
diff-tree b1ba285086ed84e8861f1047e6bc629b9b964f76 (from a4a6417472dc3421ea110293dca85b691f3ce7b4)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 26 00:50:06 2007 -0400

    fix up COPYING to avoid mentioning source files etc.

diff --git a/COPYING b/COPYING
index be90312..a1b1beb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,11 +1,6 @@
-HAL is licensed to you under your choice of the Academic Free
+hal-info is licensed to you under your choice of the Academic Free
 License version 2.1, or the GNU General Public License version 2.
-Both licenses are included here. Some individual source code files 
-and/or binaries may be under the GPL only or under the LGPG.
-
-Each source code file is marked with the proper copyright information.
-
-
+Both licenses are included here. 
 
 The Academic Free License
 v. 2.1