r8 - trunk

[des at projects.linpro.no]

Author: des
Date: 2006-02-20 11:11:10 +0100 (Mon, 20 Feb 2006)
New Revision: 8

Modified:
   trunk/LICENSE
Log:
Use dual copyright (Verdens Gang AS and Linpro AS) and the exact same
license text as used by FreeBSD and OpenBSD.

Modified: trunk/LICENSE
===================================================================
--- trunk/LICENSE	2006-02-11 00:04:28 UTC (rev 7)
+++ trunk/LICENSE	2006-02-20 10:11:10 UTC (rev 8)
@@ -1,3 +1,4 @@
+Copyright (c) 2006 Verdens Gang AS
 Copyright (c) 2006 Linpro AS
 All rights reserved.
 
@@ -5,16 +6,15 @@
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer
-   in this position and unchanged.
+   notice, this list of conditions and the following disclaimer.
 2. 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.
 
-THIS SOFTWARE IS PROVIDED BY LINPRO AND ITS CONTRIBUTORS ``AS IS'' AND
+THIS SOFTWARE IS PROVIDED BY AUTHOR 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 AUTHOR OR CONTRIBUTORS BE LIABLE
+ARE DISCLAIMED.  IN NO EVENT SHALL AUTHOR 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)