Merge branch 'dbus-1.6'

diff --cc NEWS
index 442b38d,86b497d..93a968f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,52 -1,6 +1,66 @@@
 -D-Bus 1.6.10 (UNRELEASED)
 +D-Bus 1.7.2 (UNRELEASED)
  ==
  
++• Unix-specific:
++  · Under systemd, log to syslog only, not stderr, avoiding duplication
++    (fd.o #61399, #39987; Colin Walters, Dagobert Michelsen)
++  · Include alloca.h for alloca() if available, fixing compilation on
++    Solaris 10 (fd.o #63071, Dagobert Michelsen)
++  · Allow use of systemd-logind without the rest of systemd
++    (fd.o #62585, Martin Pitt)
++  · When built with CMake, link to librt and use the right path for
++    meinproc's XSLT stylesheets (fd.o #61637, Ralf Habacker)
++
++• Windows-specific:
++  · Do not claim that all bus clients have the dbus-daemon's credentials
++    (fd.o #61787, Ralf Habacker)
++
 +D-Bus 1.7.0 (2013-02-22)
 +==
 +
 +The "Disingenuous Assertions" release.
 +
 +This is a new development release, starting the 1.7.x branch. D-Bus 1.6
 +remains the recommended version for long-term-supported distributions
 +or the upcoming GNOME 3.8 release.
 +
 +Build-time configuration changes:
 +
 +• The --with-dbus-session-bus-default-address configure option is no longer
 +  supported. Use the new --with-dbus-session-bus-connect-address and
 +  --with-dbus-session-bus-listen-address options instead. On Windows, you
 +  usually want them to have the same argument; on Unix, the defaults are
 +  usually correct.
 +
 +• Similarly, the DBUS_SESSION_BUS_DEFAULT_ADDRESS CMake variable is no longer
 +  supported; use the new DBUS_SESSION_BUS_LISTEN_ADDRESS and
 +  DBUS_SESSION_BUS_CONNECT_ADDRESS variables instead.
 +
 +• cmake/cross-compile.sh has been removed. Instead, please use a
 +  cross-toolchain file (-DCMAKE_TOOLCHAIN_FILE) as documented at
 +  <http://www.vtk.org/Wiki/CMake_Cross_Compiling>; or use Autotools
 +  as documented in "info automake Cross-Compilation", and set
 +  PKG_CONFIG_PATH appropriately.
 +
 +Requirements:
 +
 +• Man pages now require xmlto (or either xmlto or meinproc, if using CMake).
 +• man2html is no longer used.
 +
 +Enhancements:
 +
 +• D-Bus Specification 0.20
 +  · actually say that /org/freedesktop/DBus is the object that
 +    implements o.fd.DBus (fd.o #51865, Colin Walters)
 +  · various reorganisation for better clarity (fd.o #38252, Simon McVittie)
 +  · stop claiming that all basic types work just like INT32 (strings don't!)
 +
 +• The "source code" for the man pages is now Docbook XML, eliminating
 +  the outdated duplicate copies used when building with CMake.
 +  (fd.o #59805; Ralf Habacker, Simon McVittie)
 +
 +Fixes:
 +
  • In the activation helper, when compiled for tests, do not reset the system
    bus address, fixing the regression tests. (fd.o #52202, Simon)
  

diff --cc configure.ac
Simple merge

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