Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 75641f0,46cf8b3..5491e66
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,28 -1,17 +1,34 @@@
 -D-Bus 1.6.14 (UNRELEASED)
 +D-Bus 1.7.4 (UNRELEASED)
  ==
  
 -...
 -
 -D-Bus 1.6.12 (2013-06-13)
 -==
 -
 -Fixes:
++Security fixes:
+ 
+ • CVE-2013-2168: Fix misuse of va_list that could be used as a denial
+   of service for system services. Vulnerability reported by Alexandru Cornea.
+   (Simon)
+ 
 +Dependencies:
 +
 +• The Windows version of libdbus now contains a C++ source file, used
 +  to provide global initialization when the library is loaded.
 +  gcc (mingw*) users should ensure that g++ is also installed.
 +
 +• The libxml2-based configuration reader (which hasn't worked for 2.5 years,
 +  and was never the recommended option) has been removed. Expat is now a
 +  hard dependency.
 +
 +Enhancements:
 +
 +• It should now be safe to call dbus_threads_init_default() from any thread,
 +  at any time. Authors of loadable modules and plugins that use libdbus
 +  should consider doing so during initialization.
 +  (fd.o #54972, Simon McVittie)
 +
 +• Improve dbus-send documentation and command-line parsing (fd.o #65424,
 +  Chengwei Yang)
 +
- Fixes:
++Other fixes:
 +
  • In dbus-daemon, don't crash if a .service file starts with key=value
    (fd.o #60853, Chengwei Yang)
  

diff --cc dbus/dbus-sysdeps-unix.c
Simple merge

diff --cc dbus/dbus-sysdeps-win.c
Simple merge