From 6cd0a5eaf0bb7470a4e0c09c5c30a1ecb6d0b557 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Sat, 31 Mar 2012 10:01:43 +0530
Subject: [PATCH] Merge copyright years in resolv/nss_dns/dns-host.c

---
 ChangeLog                 | 4 ++++
 resolv/nss_dns/dns-host.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 61ec1e1..dca8ed9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-31  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* resolv/nss_dns/dns-host.c: Merge copyright years.
+
 2012-03-22  Liubov Dmitrieva  <liubov.dmitrieva@gmail.com>
 
 	* sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Update.
diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
index ba83c44..a924d40 100644
--- a/resolv/nss_dns/dns-host.c
+++ b/resolv/nss_dns/dns-host.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2004, 2007-2010, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Extended from original form by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
-- 
2.7.4