Merge branch 'dbus-1.10'

diff --cc dbus/dbus-spawn-win.c
index 3ae5749c673b9d6efddf666250859248113eeab6,f741f923acb6390d24dde7041a9d2a440ac92b63..119bfd1e35b78ac7111c410d1b12a64c7e51bf52
--- 1/dbus/dbus-spawn-win.c
--- 2/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@@ -603,8 -605,15 +603,9 @@@ babysitter (void *parameter
  {
    int ret = 0;
    DBusBabysitter *sitter = (DBusBabysitter *) parameter;
+   HANDLE handle;
  
    PING();
 -  if (sitter->child_setup)
 -    {
 -      PING();
 -      (*sitter->child_setup) (sitter->user_data);
 -    }
 -
    _dbus_verbose ("babysitter: spawning %s\n", sitter->log_name);
  
    PING();