From ebac5578835a6bb6bac81fd3a6bd4a3022b2486d Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 May 2010 14:41:47 -0700
Subject: [PATCH] Revert accidental change to COPYING, move authors to master
 branch.

---
 AUTHORS | 4 ----
 COPYING | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 AUTHORS

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 04ebc204f6..0000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Brian Behlendorf <behlendorf1@llnl.gov>,
-Herb Wartens <wartens2@llnl.gov>,
-Jim Garlick <garlick@llnl.gov>,
-Ricardo M. Correia <Ricardo.M.Correia@sun.com>
diff --git a/COPYING b/COPYING
index 50dcc09e32..90f44901b6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,2 +1,2 @@
-The library is distributed under the terms of the CDDL.
-See the file OPENSOLARIS.LICENSE for more information.
+Please see COPYRIGHT and OPENSOLARIS.LICENSE for the copyright
+and license details.