Merge branch 'dbus-1.6'

Conflicts:
	NEWS

diff --cc NEWS
index 230e589f81a13e6f552cfc3d4bdd28a1413b1a15,01e306f6c7e8bc46b64cc5765afe06b9abc1ba02..ee1a4b9bf02f14b7bf6a838259fcbad953403af3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -15,16 -6,15 +15,19 @@@ Fixes
  • If malloc() returns NULL in _dbus_string_init() or similar, don't free
    an invalid pointer if the string is later freed (fd.o #65959, Chengwei Yang)
  
 -D-Bus 1.6.12 (2013-06-13)
+ • If malloc() returns NULL in dbus_set_error(), don't va_end() a va_list
+   that was never va_start()ed (fd.o #66300, Chengwei Yang)
+ 
 +• Windows-specific:
 +  · Remove unavailable command-line options from 'dbus-daemon --help'
 +    (fd.o #42441, Ralf Habacker)
 +
 +D-Bus 1.7.4 (2013-06-13)
  ==
  
 -The “does this unit have a soul?” release.
 +The “but is your thread-safety thread-safe?” release.
  
 -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.