Merge branch 'dbus-1.4'

Conflicts:
	cmake/CMakeLists.txt

diff --cc cmake/CMakeLists.txt
index 72c4231,51d27cd..21728a7
--- 1/cmake/CMakeLists.txt
--- 2/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@@ -87,12 -85,11 +85,11 @@@ if (WIN32
      include(Win32Macros)
      addExplorerWrapper(${CMAKE_PROJECT_NAME})
  endif (WIN32)
- find_package(LibXml2)
- find_package(LibExpat)
- find_package(X11)
+ 
+ option (DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" ON)
  
  if(NOT WIN32)
 -      OPTION(DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON)
 +      option (DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON)
  endif(NOT WIN32)
  
  #AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)