Merge branch 'dbus-1.6'

diff --cc NEWS
index ed3f000,bab9dda..a7d086b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,38 -1,11 +1,40 @@@
 -D-Bus 1.6.6 (UNRELEASED)
 +D-Bus 1.7.0 (UNRELEASED)
  ==
  
 +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.
 +
 +Enhancements:
 +
 +• 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!)
 +
 +Fixes:
 +
  • Unix-specific:
    · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin)
+   · Work around interdependent headers on OpenBSD by including sys/types.h
+     before each use of sys/socket.h (fd.o #54418, Brad Smith)
  
 +• Windows-specific:
 +  · The default session bus listening and connecting address is now
 +    "autolaunch:", which makes D-Bus on Windows interoperate with itself
 +    and GDBus "out of the box". Use the configure options and cmake variables
 +    described above if you require a different autolaunch scope.
 +    (fd.o #38201, Simon McVittie)
 +
  D-Bus 1.6.4 (2012-07-18)
  ==
  

diff --cc configure.ac
Simple merge