From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 8 Jul 2011 10:02:24 +0000 (-0700)
Subject: Merge from gnulib.
X-Git-Tag: emacs-pretest-24.0.90~104^2~430
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2287ac9896c30303d7f469a3e5cb348fbbbd9e23;p=emacs.git

Merge from gnulib.
---

2287ac9896c30303d7f469a3e5cb348fbbbd9e23
diff --cc ChangeLog
index 217e1d30ff5,128d3283030..d04d7e2e279
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,7 +1,15 @@@
+ 2011-07-08  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* lib/getopt.c, lib/unistd.in.h, m4/getopt.m4: Merge from gnulib.
+ 
 +2011-07-07  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +	* configure.in (maintainer-mode): Reflect default in help string.
 +
 +2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
 +
 +	* configure.in: Remove reference to iris4d.h.
 +
  2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
  
  	* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.