Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 320c78bf888b857c5760ea4bd8c2b7c2bbd80861,2a8f8ed08ded697339d6f4191e674900af12c7d3..3dd3c2d21090e89647907d3c765d448b1ee92993
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,6 -1,12 +1,12 @@@
 -D-Bus 1.6.2 (UNRELEASED)
 +D-Bus 1.7.0 (UNRELEASED)
  ==
  
+ Fixes:
+ 
+ • Add dbus-launch --exit-with-x11 option. Distributions should use this
+   in their X11 session startup infrastructure, in preference to
+   the --exit-with-session option. (fd.o #39197, Simon McVittie)
+ 
  D-Bus 1.6.0 (2012-06-05)
  ==