Merge branch 'dbus-1.4'

Conflicts:
	NEWS

diff --cc NEWS
index 4a030fa,72f32de..b42cc92
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -30,31 -26,7 +30,33 @@@ D-Bus 1.5.10 (UNRELEASED
  • Build documentation correctly if man2html doesn't support filenames on
    its command-line (fd.o #43875, Jack Nagel)
  
 +• Improve test coverage. To get even more coverage, run the tests with
 +  DBUS_TEST_SLOW=1 (fd.o #38285, Simon McVittie)
 +
 +• Reduce the size of the shared library by moving functionality only used
 +  by dbus-daemon, tests etc. into their internal library and deleting
 +  unused code (fd.o #34976, #39759; Simon McVittie)
 +
 +• Add dbus-daemon --nopidfile option, overriding the configuration, for
 +  setups where the default configuration must include <pidfile/> to avoid
 +  breaking traditional init, but the pid file is in fact unnecessary; use
 +  it under systemd to improve startup time a bit (fd.o #45520,
 +  Lennart Poettering)
 +
 +• Optionally (if configured --with-valgrind) add instrumentation to debug
 +  libdbus and associated tools more meaningfully under Valgrind
 +  (fd.o #37286, Simon McVittie)
 +
 +• Improve the dbus-send(1) man page (fd.o #14005, Simon McVittie)
 +
++• Make dbus-protocol.h compatible with C++11 (fd.o #46147, Marc Mutz)
++
  • 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'