+2012-09-23 Paul Eggert <eggert@cs.ucla.edu>
+
+ * Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile,
+ to avoid problems with recursion when using GNU make.
+
+2012-09-22 Paul Eggert <eggert@cs.ucla.edu>
+
+ * Makefile.in (bootstrap): Simplify build procedure.
+ Suggested by Wolfgang Jenker in
+ <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
+
+ Merge from gnulib, incorporating:
+ 2012-09-22 sockets, sys_stat: remove AC_C_INLINE in MSVC-only cases
+
2012-09-19 Tassilo Horn <tsdh@gnu.org>
* doc/emacs/misc.texi (DocView Slicing): Document new slice from