update copyright notice

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 1e7d5d2e149c6754f49b6f9f111d19248150cf9e..32b4d3f754128d2bbc8caabbbc4110fe21b196af 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-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: db.h,v 1.76.18.15 2010/11/17 10:21:02 marka Exp $ */
+/* $Id: db.h,v 1.76.18.16 2010/11/17 23:45:12 tbox Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
@@ -652,7 +652,7 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *     dns_trust_glue.
  *
  * \li If 'options' does not have #DNS_DBFIND_ADDITIONALOK set, then no
- *     additional records will be returned.  Only caches can have 
+ *     additional records will be returned.  Only caches can have
  *     rdataset with trust dns_trust_additional.
  *
  * \li If 'options' does not have #DNS_DBFIND_PENDINGOK set, then no

diff --git a/util/merge_copyrights b/util/merge_copyrights
index ff0cbbed865271a19d15e2c0cec46fd2c9008fea..4f82a048bd5345c863bc58f671a09990d35200ee 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 #
-# Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2007, 2009, 2010  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.19.18.13 2010/11/17 03:17:12 marka Exp $
+# $Id: merge_copyrights,v 1.19.18.14 2010/11/17 23:45:12 tbox Exp $
 
 %file_types = ();
 %file_years = ();