Merge from gnulib.

diff --cc ChangeLog
index 217e1d3,128d328..d04d7e2
--- 1/ChangeLog
--- 2/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.