Merge branch 'dbus-1.8'

Conflicts:
	NEWS

diff --cc NEWS
index daeff0b,2cff8cc..c767807
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,58 -1,18 +1,65 @@@
 -D-Bus 1.8.8 (UNRELEASED)
 +D-Bus 1.9.0 (UNRELEASED)
  ==
  
 +Requirements:
 +
 +• Support for the systemd: (LISTEN_FDS) pseudo-transport on Linux now
 +  requires the sd-daemon shared library, dropping the embedded convenience
 +  copy (fd.o #71818, Simon)
 +
 +Build-time configuration changes:
 +
 +• The CMake build system now builds the same shared library name as Autotools
 +  on at least Linux and Windows:
 +  - on Linux (and perhaps other Unix platforms), it previously built
 +    libdbus-1.so, but now builds libdbus-1.so.3.* with development
 +    symlink libdbus-1.so and SONAME/symlink libdbus-1.so.3
 +  - on Windows, it previously built either libdbus-1.dll (release) or
 +    libdbus-1d.dll (debug), but now builds libdbus-1-3.dll, copied to
 +    libdbus-1.dll for compatibility with older applications.
 +  (fd.o #74117, Ralf Habacker)
 +
 +Enhancements:
 +
 +• on Unix platforms, disable Nagle's algorithm on TCP connections to improve
 +  initial latency (fd.o #75544, Matt Hoosier)
 +
 +• use backtrace() if it is in -lexecinfo instead of libc, as on NetBSD
 +  (fd.o #69702, Patrick Welche)
 +
  Fixes:
  
 +• fix an incorrect error message if a Unix socket path is too long
 +  (fd.o #73887, Antoine Jacoutot)
 +
 +• in an MSYS/Cygwin environment, pass Unix-style filenames to xmlto,
 +  fixing documentation generation (fd.o #75860, Руслан Ижбулатов)
 +
 +• in Unix with X11, avoid giving dbus-launch a misleading argv[0]
 +  in ps(1) (fd.o #69716, Chengwei Yang)
 +
 +• avoid calling poll() with timeout < -1, which is considered invalid
 +  on FreeBSD and NetBSD (fd.o #78480, Jaap Boender)
 +
 +• be portable to BSD-derived platforms where O_CLOEXEC is unavailable in libc
 +  (like Mac OS X 10.6), or available in libc but unsupported by the kernel
 +  (fd.o #77032; rmvsxop, OBATA Akio, Patrick Welche)
 +
+ • Check for libsystemd from systemd >= 209, falling back to
+   the older separate libraries if not found (Umut Tezduyar Lindskog,
+   Simon McVittie)
+ 
  • Fix compilation with --enable-stats (fd.o #81043, Gentoo #507232;
    Alban Crequy)
  
 +• Fix include path for test/internal/*.c with cmake (Ralf Habacker)
 +
 +• Change DBUS_TYPE_G_BYTE_ARRAY reference in dbus-tutorial.xml
 +  to the correct DBUS_TYPE_G_UCHAR_ARRAY (fd.o #80795, Thomas Haller)
 +
+ • Improve documentation for running tests on Windows (fd.o #41252,
+   Ralf Habacker)
+ 
  D-Bus 1.8.6 (2014-06-02)
  ==
  

diff --cc configure.ac
Simple merge