From: Jim Meyering <jim@meyering.net>
Date: Wed, 4 Jan 2006 07:13:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v6.0~972
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0aea37a1b31da6a711cf8229497dd07915938a88;p=thirdparty%2Fcoreutils.git

*** empty log message ***
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 07fab530e6..2b5ec2d443 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-04  Jim Meyering  <jim@meyering.net>
+
+	Merge from glibc.
+	* fts.c (fts_open): Avoid function call in MAX macro use.
+
 2006-01-03  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* xtime.h (xtime_make, xtime_nonnegative_nsec, xtime_nsec): Use