diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 73c2bd0508..4001666f09 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007, 2008, 2010  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 2000, 2001  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.32 2010/06/22 03:58:36 marka Exp $
+# $Id: Makefile.in,v 1.33 2010/06/23 23:46:58 tbox Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 001b2a57a4..1d07975eb8 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.422 2010/06/23 01:31:43 marka Exp $ */
+/* $Id: resolver.c,v 1.423 2010/06/23 23:46:58 tbox Exp $ */
 
 /*! \file */
 
@@ -6166,22 +6166,22 @@ fctx_decreference(fetchctx_t *fctx) {
 	INSIST(fctx->references > 0);
 	fctx->references--;
 	if (fctx->references == 0) {
-                /*
-                 * No one cares about the result of this fetch anymore.
-                 */
-                if (fctx->pending == 0 && fctx->nqueries == 0 &&
-                    ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) {
-                        /*
-                         * This fctx is already shutdown; we were just
-                         * waiting for the last reference to go away.
-                         */
-                        bucket_empty = fctx_destroy(fctx);
-                } else {
-                        /*
-                         * Initiate shutdown.
-                         */
-                        fctx_shutdown(fctx);
-                }
+		/*
+		 * No one cares about the result of this fetch anymore.
+		 */
+		if (fctx->pending == 0 && fctx->nqueries == 0 &&
+		    ISC_LIST_EMPTY(fctx->validators) && SHUTTINGDOWN(fctx)) {
+			/*
+			 * This fctx is already shutdown; we were just
+			 * waiting for the last reference to go away.
+			 */
+			bucket_empty = fctx_destroy(fctx);
+		} else {
+			/*
+			 * Initiate shutdown.
+			 */
+			fctx_shutdown(fctx);
+		}
 	}
 	return (bucket_empty);
 }
diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 1de53a274e..f28ba6e72e 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 2002, 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: grammar.h,v 1.20 2010/06/22 03:58:38 marka Exp $ */
+/* $Id: grammar.h,v 1.21 2010/06/23 23:46:58 tbox Exp $ */
 
 #ifndef ISCCFG_GRAMMAR_H
 #define ISCCFG_GRAMMAR_H 1
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index 43f9c000ec..85f282c5dd 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  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: parser.c,v 1.133 2010/06/22 03:58:38 marka Exp $ */
+/* $Id: parser.c,v 1.134 2010/06/23 23:46:58 tbox Exp $ */
 
 /*! \file */
 
diff --git a/util/kit.sh b/util/kit.sh
index a6d588670d..a0a73d74d6 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2004, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004, 2007-2010  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: kit.sh,v 1.42 2010/06/22 06:14:20 marka Exp $
+# $Id: kit.sh,v 1.43 2010/06/23 23:46:58 tbox Exp $
 
 # Make a release kit
 #