Merge branch 'dbus-1.4'

diff --cc NEWS
index b9a330770e9224ff47a57ce7cc7979565cd9057a,247aa9fd6e321b42624db4f2f3a43926ad10aa3e..c1aa631869ccea19023455a8bd78a6bfed534dc6
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,18 -1,32 +1,38 @@@
 -D-Bus 1.4.18 (UNRELEASED)
 +D-Bus 1.5.10 (UNRELEASED)
  ==
  
- …
+ • Improve cmake build system (Ralf Habacker):
+   · simplify XML parser dependencies (fd.o #41027)
+   · generate build timestamp (fd.o #41029)
+   · only create batch files on Windows
+   · fix option and cache syntax
+   · add help-options target
+   · share dbus-arch-deps.h.in with autotools rather than having our
+     own version (fd.o #41033)
+ 
+ • Build tests successfully with older GLib, as found in e.g. Debian 6
+   (fd.o #41219, Simon McVittie)
+ 
+ • Unix-specific:
+   · Avoid a highly unlikely fd leak (fd.o #29881, Simon McVittie)
+   · Don't close invalid fd -1 if getaddrinfo fails (fd.o #37258, eXeC001er)
+   · Don't touch ~/.dbus and ~/.dbus-keyrings when running 'make installcheck'
+     (fd.o #41218, Simon McVittie)
+ 
+ • Windows-specific:
+   · Find the dbus-daemon executable next to the shared library (fd.o #41558;
+     Jesper Dam, Ralf Habacker)
  
 -D-Bus 1.4.16 (2011-09-21)
 +D-Bus 1.5.8 (2011-09-21)
  ==
  
 -The "this answerphone fails to answer the phone" release.
 +The "cross-metering" release.
 +
 +In addition to dead code removal and refactoring, this release contains all
 +of the bugfixes from 1.4.16.
 +
 +• Clean up dead code, and make more warnings fatal in development builds
 +  (fd.o #39231, fd.o #41012; Simon McVittie)
  
  • If full test coverage is requested via --enable-tests, strictly require
    Python, pygobject and dbus-python, which are required by some tests; if not,

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