Merge branch 'dbus-1.4'

Conflicts:
	NEWS

diff --cc NEWS
index 3b27b08,100235f..87eb54f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -16,14 -16,10 +16,17 @@@ D-Bus 1.5.10 (UNRELEASED
  • Build tests successfully with older GLib, as found in e.g. Debian 6
    (fd.o #41219, Simon McVittie)
  
 +• Avoid use of deprecated GThread API (fd.o #44413, Martin Pitt)
 +
+ • Build documentation correctly if man2html doesn't support filenames on
+   its command-line (fd.o #43875, Jack Nagel)
+ 
  • Unix-specific:
 +  · Use epoll(7) for a more efficient main loop in Linux; equivalent patches
 +    welcomed for other OSs' equivalents like kqueue, /dev/poll, or Solaris
 +    event ports (fd.o #33337, Simon McVittie)
 +  · When running under systemd, use it instead of ConsoleKit to check
 +    whether to apply at_console policies (fd.o #39609, Lennart Poettering)
    · 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'