1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 15d60a55706..76bd252b1ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/allocator.h, lib/careadlinkat.c: Merge from gnulib.
+
 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         Malloc failure behavior now depends on size of allocation.