Merge branch 'dbus-1.4'

Conflicts:
	NEWS

diff --cc NEWS
index 05ddf05,efe14a8..6763c5f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -26,20 -17,8 +26,22 @@@ Other changes
  • Make "make check" in a clean tree work, by not running tests until
    test data has been set up (fd.o #34405, Simon McVittie)
  
 +• The dbus-daemon no longer busy-loops if it has a very large number of file
 +  descriptors (fd.o #23194, Simon McVittie)
 +
 +• Some cmake fixes (Ralf Habacker)
 +
 +• Remove dead code, mainly from DBusString (fd.o #38570, Simon McVittie)
 +
 +• Stop storing two extra byte order indicators in each D-Bus message
 +  (fd.o #38287, Simon McVittie)
 +
 +• Add an optional Stats interface which can be used to get statistics from
 +  a running dbus-daemon if enabled at configure time with --enable-stats
 +  (fd.o #34040, Simon McVittie)
 +
+ • Fix various typos (fd.o #27227, fd.o #38284; Sascha Silbe, Simon McVittie)
+ 
  • Documentation (fd.o #36156, Simon McVittie):
    · let xsltproc be overridden as usual: ./configure XSLTPROC=myxsltproc
    · install more documentation automatically, including man2html output

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