Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus

diff --cc cmake/dbus/CMakeLists.txt
index 04e3b24,7768874..762783b
--- 1/cmake/dbus/CMakeLists.txt
--- 2/cmake/dbus/CMakeLists.txt
+++ b/cmake/dbus/CMakeLists.txt
@@@ -199,12 -192,11 +195,12 @@@ if (WIN32
                ${DBUS_DIR}/dbus-sysdeps-win.h
        )
        set (DBUS_UTIL_SOURCES ${DBUS_UTIL_SOURCES}
+               ${DBUS_DIR}/dbus-spawn-win.c
                ${DBUS_DIR}/dbus-sysdeps-util-win.c
        )
-       set (LIBS ${LIBS} ws2_32 advapi32 netapi32)
  else (WIN32)
        set (DBUS_SHARED_SOURCES ${DBUS_SHARED_SOURCES} 
 +              ${DBUS_DIR}/dbus-file-unix.c
                ${DBUS_DIR}/dbus-pipe-unix.c
                ${DBUS_DIR}/dbus-sysdeps-unix.c
                ${DBUS_DIR}/dbus-sysdeps-pthread.c

diff --cc dbus/Makefile.am
Simple merge

diff --cc dbus/dbus-sysdeps-win.c
Simple merge