Merge branch 'master' of ssh://haible@git.sv.gnu.org/srv/git/gnulib

diff --cc ChangeLog
index 5b5d9c6a82ba205742e806d3091a6f7668f8a392,49ac738ab42f6deb06b71e4c7f89b655e36babc2..3be5159ee4306ba59605866260bc6373741ee6c5
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +2008-12-22  Bruno Haible  <bruno@clisp.org>
 +
 +      * doc/posix-functions/mbtowc.texi: Mention a glibc bug.
 +
+ 2008-12-22  Paolo Bonzini  <bonzini@gnu.org>
+ 
+       * modules/regex: Request emulations for the mb*/wc* functions we need.
+       * m4/regex.m4: Don't look for those functions here.
+       * lib/regex_internal.h: Do not check HAVE_WCRTOMB and HAVE_MBRTOWC.
+ 
  2008-12-22  Bruno Haible  <bruno@clisp.org>
  
        * modules/fnmatch (Depends-on): Remove duplicated dependency.