From ada7ae72c3b03ebbb05bb57285ba024a34ff53bd Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 28 Feb 2011 01:04:35 +0000
Subject: [PATCH] atf source maintains it's own copyright

---
 util/merge_copyrights | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/util/merge_copyrights b/util/merge_copyrights
index bd52d86c06..632d3618f4 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: merge_copyrights,v 1.35.6.2 2010/11/17 23:46:32 tbox Exp $
+# $Id: merge_copyrights,v 1.35.6.3 2011/02/28 01:04:35 marka Exp $
 
 %file_types = ();
 %file_years = ();
@@ -54,6 +54,8 @@ while (<FILES>) {
 	# Contributed code should maintain its own copyright.
 	if ($base =~ /\.\/contrib\//) {
 	     $file_types{$_} = "X";
+	} elseif ($base =~ /\.\/unit\/atf-src\//) {
+	     $file_types{$_} = "X";
 	} elsif ($base =~ /\/openssl-[a-z0-9.]*-patch$/) {
 	    $file_types{$_} = "X";
 	} elsif ($base =~ /\.(c|h|css)$/) {