Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index d75d7ad,b6b4bbd..d175a09
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,27 +1,35 @@@
 -D-Bus 1.6.4 (UNRELEASED)
 +D-Bus 1.7.0 (UNRELEASED)
  ==
  
 +Enhancements:
 +
 +• D-Bus Specification 0.20
 +  · various reorganisation for better clarity (fd.o #38252, Simon McVittie)
 +  · stop claiming that all basic types work just like INT32 (strings don't!)
 +
 +Fixes:
 +
+ • Detect that users are "at the console" correctly when configured with
+   a non-default path such as --enable-console-auth-dir=/run/console
+   (fd.o #51521, Dave Reisner)
+ 
+ D-Bus 1.6.2 (2012-06-27)
+ ==
+ 
+ The "Ice Cabbage" release.
+ 
+ • Change how we create /var/lib/dbus so it works under Automake >= 1.11.4
+   (fd.o #51406, Simon McVittie)
+ 
+ • Don't return from dbus_pending_call_set_notify with a lock held on OOM
+   (fd.o #51032, Simon McVittie)
+ 
+ • Disconnect "developer mode" (assertions, verbose mode etc.) from
+   Automake maintainer mode. D-Bus developers should now configure with
+   --enable-developer. Automake maintainer mode is now on by default;
+   distributions can disable it with --disable-maintainer-mode.
+   (fd.o #34671, Simon McVittie)
+ 
  • Automatically define DBUS_STATIC_BUILD in static-only Autotools builds,
    fixing linking when targeting Windows (fd.o #33973; william, Simon McVittie)
  

diff --cc configure.ac
Simple merge