From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 Mar 2011 17:33:16 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~513^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8af8e70ee535bd2d657a034e1452f78925c9ca38;p=emacs.git

Merge from mainline.
---

8af8e70ee535bd2d657a034e1452f78925c9ca38
diff --cc ChangeLog
index 8a76e997905,d13832b9060..5d840caf491
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,8 +1,19 @@@
- 2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
++2011-03-22  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* Makefile.in (GNULIB_MODULES): Add socklen.
 +	* configure.in: Do not check for sys/socket.h, since socklen does that.
 +	* m4/socklen.m4: New automatically-generated file, from gnulib.
 +
- 2011-03-21  Paul Eggert  <eggert@cs.ucla.edu>
- 
 +	fakemail: Remove dependency on ignore-value.
 +	* Makefile.in (GNULIB_MODULES): Add stdio.
 +	* lib/stdio.in.h, m4/stdio_h.m4: New files, automatically
 +	imported from gnulib.
 +	* .bzrignore: Add lib/stdio.h.
+ 2011-03-22  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* autogen/copy_autogen: Work from ./ or ../.
+ 	Fix time-stamps.
+ 	* autogen.sh: Doc fix.
  
  2011-03-20  Glenn Morris  <rgm@gnu.org>