merge emacs-23

diff --cc src/ChangeLog
index 55636cc9f40913b5126b1dd874a301c7d596a140,9a5043cf65ca48f25cea88ece3b04496f6112d9f..b756aebe8a5c688511e09f32638bc255e184f760
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,17 +1,22 @@@
 +2010-09-29  Kenichi Handa  <handa@m17n.org>
 +
 +      * xfont.c (xfont_open): Fix setting of font->average_width from
 +      :avgwidth property (Bug#7123).
 +
+ 2010-09-28  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * dbusbind.c (syms_of_dbusbind): Use putenv instead of setenv, it
+       is more portable.
+ 
+       * keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
+       (kbd_buffer_get_event): ... here. This is needed for cygwin, which
+       has not defined SIGIO.
+ 
+ 2010-09-27  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * dbusbind.c (syms_of_dbusbind): Set $DBUS_FATAL_WARNINGS to "0".
+       (Bug#7113)
+ 
  2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
  
        * xgselect.c (xg_select): Clear file descriptors not set from