Merge branch 'dbus-1.6'

diff --cc NEWS
index 6d7910ac59e2f29d6c72f68139aba5a034ed32b8,2bf704661a770d377f9824c51cd1a4b705c8bff5..ecd2f408b22146334aa700f4bcc8e9b0e9023591
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -3,31 -3,15 +3,34 @@@ D-Bus 1.7.10 (UNRELEASED
  
  Fixes:
  
+ • don't leak memory on out-of-memory while listing activatable or
+   active services (fd.o #71526, Radoslaw Pajak)
+ 
  • fix undefined behaviour in a regression test (fd.o #69924, DreamNik)
  
 -D-Bus 1.6.18 (2013-11-01)
 +• on SELinux systems, don't assume that SECCLASS_DBUS, DBUS__ACQUIRE_SVC
 +  and DBUS__SEND_MSG are numerically equal to their values in the
 +  reference policy (fd.o #88719, osmond sun)
 +
 +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 bus/activation.c
Simple merge