Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index bb2b388d98c2b7e43175c651343e754e6e428e56,769fcadc8fb8a1183d11e16f2d019c5117a0f553..dfac67f575fc57afa44919476c0c29ec94b9c87c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,12 +1,20 @@@
 -D-Bus 1.6.6 (UNRELEASED)
 +D-Bus 1.7.0 (UNRELEASED)
  ==
  
+ • Unix-specific:
+   · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin)
+ 
+ D-Bus 1.6.4 (2012-07-18)
+ ==
+ 
 +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)

diff --cc configure.ac
Simple merge