Merge branch 'dbus-1.6'

Conflicts:
	NEWS

diff --cc NEWS
index 2f85aa6447b712df4100b5e5ad089cfed827d62f,a3c4ad5b1b4a6e779c7534185806fef8dcb67007..4fd09775371ff320e40aab99babac309570b0ab7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,15 -1,10 +1,19 @@@
 -D-Bus 1.6.10 (UNRELEASED)
 +D-Bus 1.7.2 (UNRELEASED)
  ==
  
 +Configuration changes:
 +
 +• On non-QNX Unix platforms, the default limit on fds per message in the
 +  session bus configuration has reduced from 4096 to 1024. The default
 +  limit used on the system bus was already 1024. On QNX, both limits are
 +  reduced further, to 128.
 +
 +Fixes:
 +
+ • Following Unicode Corrigendum #9, the noncharacters U+nFFFE, U+nFFFF,
+   U+FDD0..U+FDEF are allowed in UTF-8 strings again.
+   (fd.o #63072, Simon McVittie)
+ 
  • Diagnose incorrect use of dbus_connection_get_data() with negative slot
    (i.e. before allocating the slot) rather than returning junk
    (fd.o #63127, Dan Williams)