Merge remote-tracking branch 'origin/dbus-1.4'

diff --cc cmake/CMakeLists.txt
index b68a397,04f318a..e414e04
--- 1/cmake/CMakeLists.txt
--- 2/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@@ -96,10 -96,10 +96,12 @@@ if(NOT WIN32
  endif(NOT WIN32)
  
  #AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
 -OPTION(DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF)
 +option (DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF)
 +
 +option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF)
  
+ option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF)
+ 
  # do config checks
  INCLUDE(ConfigureChecks.cmake)