Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	bus/activation-helper.c
	configure.ac

diff --cc NEWS
index a7d086b,618de45..0db2e5b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,28 -1,28 +1,32 @@@
 -D-Bus 1.6.10 (UNRELEASED)
 +D-Bus 1.7.0 (UNRELEASED)
  ==
  
 -...
 +Build-time configuration changes:
  
 -D-Bus 1.6.8 (2012-09-28)
 -==
 +• 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.
  
 -The "Fix one thing, break another" release.
 +• 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.
  
 -• Follow up to CVE-2012-3524: The additional hardening
 -  work to use __secure_getenv() as a followup to bug #52202
 -  broke certain configurations of gnome-keyring.  Given
 -  the difficulty of making this work without extensive
 -  changes to gnome-keyring, use of __secure_getenv() is
 -  deferred.
 +Enhancements:
  
 -D-Bus 1.6.6 (2012-09-28)
 -==
 +• D-Bus Specification 0.21
 +  · 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 "Clear the environment in your setuid binaries, please" release.
 +Fixes:
  
+ • CVE-2012-3524: Don't access environment variables (fd.o #52202)
+   Thanks to work and input from Colin Walters, Simon McVittie,
+   Geoffrey Thomas, and others.
++
  • Unix-specific:
    · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin)
    · Work around interdependent headers on OpenBSD by including sys/types.h