Merge branch 'dbus-1.6'

Conflicts:
	NEWS

diff --cc NEWS
index 825121f8fccda9bc238d1c4e8db677e30d94d10d,95c3c10c6682deb3ccc273d0079ece03db8c6287..ccb83aed978b9d2d22292d770de66381527f22a7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,25 -1,14 +1,29 @@@
 -D-Bus 1.6.19 (UNRELEASED)
 +D-Bus 1.7.10 (UNRELEASED)
  ==
  
 -D-Bus 1.6.18 (2013-11-01)
+ Fixes:
+ 
+ • fix undefined behaviour in a regression test (fd.o #69924, DreamNik)
+ 
 +D-Bus 1.7.8 (2013-11-01)
  ==
  
 -The “sunflower plains” release.
 +The “extreme hills” release.
 +
 +Dependencies:
 +
 +• If systemd support is enabled, libsystemd-journal is now required.
 +
 +Enhancements:
 +
 +• When activating a non-systemd service under systemd, annotate its
 +  stdout/stderr with its bus name in the Journal. Known limitation:
 +  because the socket is opened before forking, the process will still be
 +  logged as if it had dbus-daemon's process ID and user ID.
 +  (fd.o #68559, Chengwei Yang)
 +
 +• Document more configuration elements in dbus-daemon(1)
 +  (fd.o #69125, Chengwei Yang)
  
  Fixes:
  

diff --cc dbus/dbus-marshal-recursive-util.c
Simple merge