diff --git a/bin/tests/db/t_db.c b/bin/tests/db/t_db.c
index e4d9b3f4e7..6ec057a53a 100644
--- a/bin/tests/db/t_db.c
+++ b/bin/tests/db/t_db.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_db.c,v 1.37 2009/01/22 05:39:28 marka Exp $ */
+/* $Id: t_db.c,v 1.38 2009/01/22 23:47:53 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/dst/t_dst.c b/bin/tests/dst/t_dst.c
index 0a3a49b55f..c801022869 100644
--- a/bin/tests/dst/t_dst.c
+++ b/bin/tests/dst/t_dst.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_dst.c,v 1.56 2009/01/22 05:39:28 marka Exp $ */
+/* $Id: t_dst.c,v 1.57 2009/01/22 23:47:54 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c
index bccf024cf6..8df588b0c6 100644
--- a/bin/tests/master/t_master.c
+++ b/bin/tests/master/t_master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_master.c,v 1.37 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: t_master.c,v 1.38 2009/01/22 23:47:54 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/mem/t_mem.c b/bin/tests/mem/t_mem.c
index f901a37de3..c99ddd9b69 100644
--- a/bin/tests/mem/t_mem.c
+++ b/bin/tests/mem/t_mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_mem.c,v 1.14 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: t_mem.c,v 1.15 2009/01/22 23:47:54 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/names/t_names.c b/bin/tests/names/t_names.c
index a85c7efca6..ce776dec29 100644
--- a/bin/tests/names/t_names.c
+++ b/bin/tests/names/t_names.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-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: t_names.c,v 1.47 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: t_names.c,v 1.48 2009/01/22 23:47:54 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/bin/tests/rbt/t_rbt.c b/bin/tests/rbt/t_rbt.c
index 2dd4d275f1..848e262452 100644
--- a/bin/tests/rbt/t_rbt.c
+++ b/bin/tests/rbt/t_rbt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  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 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_rbt.c,v 1.31 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: t_rbt.c,v 1.32 2009/01/22 23:47:54 tbox Exp $ */
 
 #include <config.h>
 
@@ -194,7 +194,7 @@ t1_add(char *name, dns_rbt_t *rbt, isc_mem_t *mctx, isc_result_t *dns_result) {
 			if (*dns_result != ISC_R_SUCCESS) {
 				delete_name(dns_name, mctx);
 				t_info("dns_rbt_addname failed %s\n",
-		       		       dns_result_totext(*dns_result));
+				       dns_result_totext(*dns_result));
 				++nprobs;
 			}
 		} else {
@@ -275,7 +275,7 @@ rbt_init(char *filename, dns_rbt_t **rbt, isc_mem_t *mctx) {
 	dns_result = dns_rbt_create(mctx, delete_name, mctx, rbt);
 	if (dns_result != ISC_R_SUCCESS) {
 		t_info("dns_rbt_create failed %s\n",
-		       		dns_result_totext(dns_result));
+				dns_result_totext(dns_result));
 		fclose(fp);
 		return(1);
 	}
@@ -684,7 +684,7 @@ t9_walkchain(dns_rbtnodechain_t *chain, dns_rbt_t *rbt) {
 			dns_result = dns_name_concatenate(
 			       dns_fixedname_name(&name),
 			       dns_name_isabsolute(dns_fixedname_name(&name)) ?
-			                    NULL : dns_fixedname_name(&origin),
+					    NULL : dns_fixedname_name(&origin),
 			       dns_fixedname_name(&fullname2), NULL);
 			if (dns_result != ISC_R_SUCCESS) {
 				t_info("dns_name_concatenate failed %s\n",
diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index 75b0ea7f29..2eac54b995 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.41 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: t_tasks.c,v 1.42 2009/01/22 23:47:54 tbox Exp $ */
 
 #include <config.h>
 
@@ -1990,7 +1990,7 @@ static const char *a11 =
 static void
 t11(void) {
 	t_assert("tasks", 11, T_REQUIRED, "%s", a11);
-	
+
 	if (threaded)
 		t_result(t_tasks11(1));
 	else
@@ -2144,7 +2144,7 @@ t14_callback(isc_task_t *task, isc_event_t *event) {
 	int taskno = *(int *)(event->ev_arg);
 
 
-	t_info("task enter %d\n", taskno);	
+	t_info("task enter %d\n", taskno);
 	if (taskno == T14_EXCLTASK) {
 		int	i;
 		t14_exclusiveerror = isc_task_beginexclusive(task);
@@ -2154,7 +2154,7 @@ t14_callback(isc_task_t *task, isc_event_t *event) {
 			t_info("task %d failed to got exclusive access: %d\n",
 				taskno, t14_exclusiveerror);
 		for (i = 0; i < T14_NTASKS; i++) {
-   		        t_info("task %d state %d\n", i , t14_active[i]);
+			t_info("task %d state %d\n", i , t14_active[i]);
 			if (t14_active[i])
 				t14_error++;
 		}
@@ -2272,8 +2272,8 @@ static void
 t14(void) {
 	int	result;
 
-	t_assert("tasks", 14, T_REQUIRED, "%s", 
-                 "isc_task_beginexclusive() gets exclusive access");
+	t_assert("tasks", 14, T_REQUIRED, "%s",
+		 "isc_task_beginexclusive() gets exclusive access");
 	result = t_tasks14();
 	t_result(result);
 }
diff --git a/bin/tests/timers/t_timers.c b/bin/tests/timers/t_timers.c
index 47d69b5829..12e1b76e60 100644
--- a/bin/tests/timers/t_timers.c
+++ b/bin/tests/timers/t_timers.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_timers.c,v 1.29 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: t_timers.c,v 1.30 2009/01/22 23:47:54 tbox Exp $ */
 
 #include <config.h>
 
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 443b93ff23..a427099876 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1997-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: mem.c,v 1.146 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: mem.c,v 1.147 2009/01/22 23:47:54 tbox Exp $ */
 
 /*! \file */
 
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index f0adc0f4e2..b43ee0a17f 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer.c,v 1.85 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: timer.c,v 1.86 2009/01/22 23:47:54 tbox Exp $ */
 
 /*! \file */
 
@@ -662,7 +662,7 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) {
 					isc_task_send(timer->task,
 						      ISC_EVENT_PTR(&event));
 				} else
-					UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", 
+					UNEXPECTED_ERROR(__FILE__, __LINE__, "%s",
 						 isc_msgcat_get(isc_msgcat,
 							 ISC_MSGSET_TIMER,
 							 ISC_MSG_EVENTNOTALLOC,
@@ -677,7 +677,7 @@ dispatch(isc_timermgr_t *manager, isc_time_t *now) {
 			if (need_schedule) {
 				result = schedule(timer, now, ISC_FALSE);
 				if (result != ISC_R_SUCCESS)
-					UNEXPECTED_ERROR(__FILE__, __LINE__, "%s", 
+					UNEXPECTED_ERROR(__FILE__, __LINE__, "%s",
 						isc_msgcat_get(isc_msgcat,
 							ISC_MSGSET_TIMER,
 							ISC_MSG_SCHEDFAIL,
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index b5bf39d6eb..9b6fa7fb4f 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.314 2009/01/22 05:39:29 marka Exp $ */
+/* $Id: socket.c,v 1.315 2009/01/22 23:47:54 tbox Exp $ */
 
 /*! \file */
 
@@ -3394,7 +3394,7 @@ watcher(void *uap) {
 #endif
 	}
 
-	manager_log(manager, TRACE, "%s", 
+	manager_log(manager, TRACE, "%s",
 		    isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
 				   ISC_MSG_EXITING, "watcher exiting"));
 
@@ -3841,7 +3841,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) {
 	 * Wait for all sockets to be destroyed.
 	 */
 	while (!ISC_LIST_EMPTY(manager->socklist)) {
-		manager_log(manager, CREATION, "%s", 
+		manager_log(manager, CREATION, "%s",
 			    isc_msgcat_get(isc_msgcat, ISC_MSGSET_SOCKET,
 					   ISC_MSG_SOCKETSREMAIN,
 					   "sockets exist"));