diff --git a/Makefile.in b/Makefile.in
index 7ea2eb906e..4bb9a33a65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2002  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.52.48.3 2011/02/26 05:45:54 each Exp $
+# $Id: Makefile.in,v 1.52.48.4 2011/02/28 01:18:39 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index b9b2f16a6d..b496d07589 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.225.26.8 2011/02/25 23:06:01 each Exp $ */
+/* $Id: dig.c,v 1.225.26.9 2011/02/28 01:18:40 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index d20aa681c6..b7570a437a 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.107.120.3 2011/02/25 23:06:01 each Exp $ */
+/* $Id: dig.h,v 1.107.120.4 2011/02/28 01:18:40 tbox Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 20579e811e..a14ce64d4b 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Portions Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Portions Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -29,7 +29,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.209.12.21 2011/02/24 03:35:39 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.209.12.22 2011/02/28 01:18:40 tbox Exp $ */
 
 /*! \file */
 
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 3ac3bcf82d..dafc60904d 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: conf.sh.in,v 1.39.166.8 2011/02/22 04:33:48 marka Exp $
+# $Id: conf.sh.in,v 1.39.166.9 2011/02/28 01:18:42 tbox Exp $
 
 #
 # Common configuration data for system tests, to be sourced into
diff --git a/bin/tests/system/database/clean.sh b/bin/tests/system/database/clean.sh
index 22e3c9f6a0..f129499fa6 100644
--- a/bin/tests/system/database/clean.sh
+++ b/bin/tests/system/database/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2.6.2 2011/02/22 04:33:48 marka Exp $
+# $Id: clean.sh,v 1.2.6.3 2011/02/28 01:18:42 tbox Exp $
 
 rm -f ns1/named.conf ns1/named.run ns1/named.memstats
 rm -f dig.out.*
diff --git a/bin/tests/system/database/ns1/named.conf1 b/bin/tests/system/database/ns1/named.conf1
index 0d348fd4f0..ce23999c23 100644
--- a/bin/tests/system/database/ns1/named.conf1
+++ b/bin/tests/system/database/ns1/named.conf1
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf1,v 1.2.6.2 2011/02/22 04:33:49 marka Exp $ */
+/* $Id: named.conf1,v 1.2.6.3 2011/02/28 01:18:43 tbox Exp $ */
 
 // NS1
 
diff --git a/bin/tests/system/database/ns1/named.conf2 b/bin/tests/system/database/ns1/named.conf2
index b659ae5213..670c9848d5 100644
--- a/bin/tests/system/database/ns1/named.conf2
+++ b/bin/tests/system/database/ns1/named.conf2
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf2,v 1.2.6.2 2011/02/22 04:33:49 marka Exp $ */
+/* $Id: named.conf2,v 1.2.6.3 2011/02/28 01:18:43 tbox Exp $ */
 
 // NS1
 
diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh
index b297fe5906..bf382b0507 100644
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2.6.2 2011/02/22 04:33:48 marka Exp $
+# $Id: setup.sh,v 1.2.6.3 2011/02/28 01:18:42 tbox Exp $
 
 cp ns1/named.conf1 ns1/named.conf
diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh
index 6c8b749d94..c0817a9e31 100644
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2.6.2 2011/02/22 04:33:49 marka Exp $
+# $Id: tests.sh,v 1.2.6.3 2011/02/28 01:18:43 tbox Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
diff --git a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
index e347019d3d..b7601f5b13 100644
--- a/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.below-cname.example.db
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: insecure.below-cname.example.db,v 1.2.6.2 2011/02/23 12:48:21 marka Exp $
+; $Id: insecure.below-cname.example.db,v 1.2.6.3 2011/02/28 01:18:43 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
index 8e09891e10..e17de80221 100644
--- a/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.below-cname.example.db.in
@@ -1,5 +1,4 @@
-; Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) 2000, 2001  Internet Software Consortium.
+; Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
@@ -13,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: secure.below-cname.example.db.in,v 1.2.6.2 2011/02/23 12:48:21 marka Exp $
+; $Id: secure.below-cname.example.db.in,v 1.2.6.3 2011/02/28 01:18:43 tbox Exp $
 
 $TTL 300	; 5 minutes
 @			IN SOA	mname1. . (
diff --git a/configure.in b/configure.in
index e9e8987adb..ecdb757f2b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.457.26.30 $)
+AC_REVISION($Revision: 1.457.26.31 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index fa4dbdebf5..c4dddfde64 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2008, 2010, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.163.50.3 2011/02/26 05:46:09 each Exp $
+# $Id: Makefile.in,v 1.163.50.4 2011/02/28 01:18:43 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 02647e3a01..9672fff0c6 100644
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnstest.c,v 1.2.6.2 2011/02/26 05:46:09 each Exp $ */
+/* $Id: dnstest.c,v 1.2.6.3 2011/02/28 01:18:43 tbox Exp $ */
 
 /*! \file */
 
@@ -46,12 +46,12 @@ static isc_boolean_t hash_active = ISC_FALSE, dst_active = ISC_FALSE;
  * Logging categories: this needs to match the list in bin/named/log.c.
  */
 static isc_logcategory_t categories[] = {
-	        { "",                0 },
-	        { "client",          0 },
-	        { "network",         0 },
-	        { "update",          0 },
-	        { "queries",         0 },
-	        { "unmatched",       0 },
+		{ "",                0 },
+		{ "client",          0 },
+		{ "network",         0 },
+		{ "update",          0 },
+		{ "queries",         0 },
+		{ "unmatched",       0 },
 		{ "update-security", 0 },
 		{ "query-errors",    0 },
 		{ NULL,              0 }
diff --git a/lib/dns/tests/master_test.c b/lib/dns/tests/master_test.c
index a435ded51c..6a19140aa3 100644
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master_test.c,v 1.2.6.2 2011/02/26 05:46:09 each Exp $ */
+/* $Id: master_test.c,v 1.2.6.3 2011/02/28 01:18:47 tbox Exp $ */
 
 /*! \file */
 
@@ -107,7 +107,7 @@ test_master(const char *testfile) {
 ATF_TC(master_load);
 ATF_TC_HEAD(master_load, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() loads a "
-			  	       "valid master file and returns success");
+				       "valid master file and returns success");
 }
 ATF_TC_BODY(master_load, tc) {
 	isc_result_t result;
@@ -128,7 +128,7 @@ ATF_TC_BODY(master_load, tc) {
 ATF_TC(master_unexpected);
 ATF_TC_HEAD(master_unexpected, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-			  	       "DNS_R_UNEXPECTED when file ends "
+				       "DNS_R_UNEXPECTED when file ends "
 				       "too soon");
 }
 ATF_TC_BODY(master_unexpected, tc) {
@@ -150,7 +150,7 @@ ATF_TC_BODY(master_unexpected, tc) {
 ATF_TC(master_noowner);
 ATF_TC_HEAD(master_noowner, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() accepts broken "
-			  	       "zones with no TTL for first record "
+				       "zones with no TTL for first record "
 				       "if it is an SOA");
 }
 ATF_TC_BODY(master_noowner, tc) {
@@ -172,7 +172,7 @@ ATF_TC_BODY(master_noowner, tc) {
 ATF_TC(master_nottl);
 ATF_TC_HEAD(master_nottl, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-			  	       "DNS_R_NOOWNER when no owner name "
+				       "DNS_R_NOOWNER when no owner name "
 				       "is specified");
 }
 
@@ -195,7 +195,7 @@ ATF_TC_BODY(master_nottl, tc) {
 ATF_TC(master_badclass);
 ATF_TC_HEAD(master_badclass, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() returns "
-			  	       "DNS_R_BADCLASS when record class "
+				       "DNS_R_BADCLASS when record class "
 				       "doesn't match zone class");
 }
 ATF_TC_BODY(master_badclass, tc) {
@@ -216,7 +216,7 @@ ATF_TC_BODY(master_badclass, tc) {
 ATF_TC(master_dnskey);
 ATF_TC_HEAD(master_dnskey, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "DNSKEY with key material");
+				       "DNSKEY with key material");
 }
 ATF_TC_BODY(master_dnskey, tc) {
 	isc_result_t result;
@@ -237,7 +237,7 @@ ATF_TC_BODY(master_dnskey, tc) {
 ATF_TC(master_dnsnokey);
 ATF_TC_HEAD(master_dnsnokey, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "DNSKEY with no key material");
+				       "DNSKEY with no key material");
 }
 ATF_TC_BODY(master_dnsnokey, tc) {
 	isc_result_t result;
@@ -257,7 +257,7 @@ ATF_TC_BODY(master_dnsnokey, tc) {
 ATF_TC(master_include);
 ATF_TC_HEAD(master_include, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "$INCLUDE");
+				       "$INCLUDE");
 }
 ATF_TC_BODY(master_include, tc) {
 	isc_result_t result;
@@ -277,7 +277,7 @@ ATF_TC_BODY(master_include, tc) {
 ATF_TC(master_includefail);
 ATF_TC_HEAD(master_includefail, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() understands "
-			  	       "$INCLUDE failures");
+				       "$INCLUDE failures");
 }
 ATF_TC_BODY(master_includefail, tc) {
 	isc_result_t result;
@@ -298,7 +298,7 @@ ATF_TC_BODY(master_includefail, tc) {
 ATF_TC(master_blanklines);
 ATF_TC_HEAD(master_blanklines, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() handles "
-			  	       "non-empty blank lines");
+				       "non-empty blank lines");
 }
 ATF_TC_BODY(master_blanklines, tc) {
 	isc_result_t result;
@@ -318,7 +318,7 @@ ATF_TC_BODY(master_blanklines, tc) {
 ATF_TC(master_leadingzero);
 ATF_TC_HEAD(master_leadingzero, tc) {
 	atf_tc_set_md_var(tc, "descr", "dns_master_loadfile() allows "
-			  	       "leading zeroes in SOA");
+				       "leading zeroes in SOA");
 }
 ATF_TC_BODY(master_leadingzero, tc) {
 	isc_result_t result;
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index a309a2c88a..a247fe5e05 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2000-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.164.12.24 2011/02/23 12:48:21 marka Exp $ */
+/* $Id: validator.c,v 1.164.12.25 2011/02/28 01:18:43 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/make/rules.in b/make/rules.in
index 8d7a2a4d52..61dcedc46a 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2009, 2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.64.130.3 2011/02/26 05:46:11 each Exp $
+# $Id: rules.in,v 1.64.130.4 2011/02/28 01:18:47 tbox Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
diff --git a/unit/unittest.sh.in b/unit/unittest.sh.in
index 2f418ce27a..e55473e73e 100644
--- a/unit/unittest.sh.in
+++ b/unit/unittest.sh.in
@@ -1,4 +1,20 @@
 #!/bin/sh
+#
+# Copyright (C) 2011  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# $Id: unittest.sh.in,v 1.2.6.4 2011/02/28 01:18:47 tbox Exp $
 
 PATH=${PATH}:@ATFBIN@
 export PATH
diff --git a/util/merge_copyrights b/util/merge_copyrights
index 869919706d..c2abec8cb7 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2009-2011  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1998-2001, 2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -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.31.322.7 2011/02/28 01:07:47 marka Exp $
+# $Id: merge_copyrights,v 1.31.322.8 2011/02/28 01:18:47 tbox Exp $
 
 %file_types = ();
 %file_years = ();