+2011-06-06 Paul Eggert <eggert@cs.ucla.edu>
+
+ Merge from gnulib.
+ * lib/careadlinkat.c, lib/careadlinkat.h, m4/gnulib-common.m4: Merge.
+
+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>
+
+ Use 'inline', not 'INLINE'.
+ * configure.in (INLINE): Remove.
+
+2011-05-29 Paul Eggert <eggert@cs.ucla.edu>
+
+ Adjust to recent gnulib change for @GUARD_PREFIX@.
+ * lib/makefile.w32-in (getopt_h): Substitute @GUARD_PREFIX@, too.
+ All uses of _GL_ for guard prefixes in lib/*.h replaced with
+ _@GUARD_PREFIX@_.
+
+2011-05-27 Paul Eggert <eggert@cs.ucla.edu>
+
+ * doc/misc/texinfo.tex, lib/getopt.c, lib/intprops.h: Merge from gnulib.
+
2011-05-24 Glenn Morris <rgm@gnu.org>
+ * Makefile.in (check): Just give a message if no test/ directory.
+
* configure.in: Avoid using variables inside AC_CONFIG_FILES.
* configure.in (OPT_MAKEFILES_IN): Remove.