Merge with mainline.

diff --cc ChangeLog
index 3105fee9535dce5127d99a367e0d769f962618d1,38eef57c8693064968913d17f3b94f902a3662d5..72da9a52ad22e31b2401f52562659beaed7116eb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,30 -1,6 +1,33 @@@
 +2007-10-09  Micah Cowan  <micah@cowan.name>
 +
 +      * configure.in: Renamed to configure.ac
 +      * configure.ac: Renamed from configure.in. Added invocations of
 +      AM_GNU_GETTEXT, etc.
 +      * ABOUT-NLS: Added back in (required by autoreconf :\).
 +      * Makefile.am: Added ABOUT-NLS to EXTRA_DIST.
 +
 +2007-10-09  gettextize  <bug-gnu-gettext@gnu.org>
 +
 +      * m4/gettext.m4: New file, from gettext-0.16.1.
 +      * m4/iconv.m4: New file, from gettext-0.16.1.
 +      * m4/lib-ld.m4: Upgrade to gettext-0.16.1.
 +      * m4/lib-link.m4: Upgrade to gettext-0.16.1.
 +      * m4/lib-prefix.m4: Upgrade to gettext-0.16.1.
 +      * m4/nls.m4: New file, from gettext-0.16.1.
 +      * m4/po.m4: New file, from gettext-0.16.1.
 +      * m4/progtest.m4: New file, from gettext-0.16.1.
 +      * po/Makefile.in.in: Upgrade to gettext-0.16.1.
 +      * po/Rules-quot: New file, from gettext-0.16.1.
 +      * po/boldquot.sed: New file, from gettext-0.16.1.
 +      * po/en@boldquot.header: New file, from gettext-0.16.1.
 +      * po/en@quot.header: New file, from gettext-0.16.1.
 +      * po/insert-header.sin: New file, from gettext-0.16.1.
 +      * po/quot.sed: New file, from gettext-0.16.1.
 +      * po/remove-potcdate.sin: New file, from gettext-0.16.1.
 +
+ 2007-10-08  Micah Cowan  <micah@cowan.name>
+ 
+       * AUTHORS: Credit to Ralf Wildenhues for automakifying patches.
  
  2007-10-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>