From 8be96dd183a5e70b3924f5e85da05591238014be Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Sun, 11 Jan 2009 04:32:12 +0000
Subject: * nscd/nscd.c (parse_opt): Use argp_error for bad -i argument.

>>>>>>> 1.11443
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2652b66a25..19427d8f42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-10  Roland McGrath  <roland@redhat.com>
+
+	* nscd/nscd.c (parse_opt): Use argp_error for bad -i argument.
+
 2009-01-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/fpu/libm-test-ulps: Adjust expm1 errors.
@@ -56,6 +60,7 @@
 	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Check and
 	adjust the buffer alignment.
 
+>>>>>>> 1.11443
 2009-01-07  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* sysdeps/mach/hurd/Makefile (sysdep_headers) [subdir=socket]:
-- 
cgit 1.4.1