Merge branch 'dbus-1.4' and update NEWS for master

Conflicts:
	NEWS

diff --cc NEWS
index aa2d58e269e93bc9451ccbee409cba074a337309,11bab866d8cbef71d200fef9a5019492819c378a..bcb4358ef773d2f182cebef3db0514c60989df4c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,12 -1,35 +1,58 @@@
 -D-Bus 1.4.14 (UNRELEASED)
 +D-Bus 1.5.6 (UNRELEASED)
  ==
  
- Fixes:
 -Changes:
++Potentially incompatible (Bustle and similar debugging tools will need
++changes to work as intended):
++
++• Do not allow match rules to "eavesdrop" (receive messages intended for a
++  different recipient) by mistake: eavesdroppers must now opt-in to this
++  behaviour by putting "eavesdrop='true'" in the match rule, which will
++  not have any practical effect on buses where eavesdropping is not allowed
++  (fd.o #37890, Cosimo Alfarano)
++
++Other changes:
+ 
+ • Use DBUS_ERROR_OBJECT_PATH_IN_USE if dbus_connection_try_register_object_path
 -  or dbus_connection_try_register_fallback fails, not ...ADDRESS_IN_USE
 -  (fd.o #38874, Jiří Klimeš)
++  or dbus_connection_try_register_fallback fails, not ...ADDRESS_IN_USE,
++  and simplify object-path registration (fd.o #38874, Jiří Klimeš)
+ 
+ • Consistently use atomic operations on the refcounts of DBusPendingCall
+   and DBusServer, as was done for DBusConnection in 1.4.12 (fd.o #38005,
+   Simon McVittie)
+ 
+ • Fix a file descriptor leak when connecting to a TCP socket (fd.o #37258,
+   Simon McVittie)
+ 
+ • Make "make check" in a clean tree work, by not running tests until
+   test data has been set up (fd.o #34405, Simon McVittie)
  
 -D-Bus 1.4.12 (2011-06-10)
 +• 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)
++
+ • Documentation (fd.o #36156, Simon McVittie):
+   · let xsltproc be overridden as usual: ./configure XSLTPROC=myxsltproc
+   · install more documentation automatically, including man2html output
+   · put dbus.devhelp in the right place (it must go in ${htmldir})
+ 
+ • Unix-specific (fd.o #33465, Simon McVittie):
+   · opt-in to fd passing on Solaris
+ 
+ • Windows-specific (Ralf Habacker):
+   · fix use of a mutex for autolaunch server detection
+   · don't crash on malloc failure in _dbus_printf_string_upper_bound
+ 
 +D-Bus 1.5.4 (2011-06-10)
  ==
  
  Security (local denial of service):

diff --cc bus/Makefile.am
Simple merge

diff --cc configure.ac
Simple merge

diff --cc test/Makefile.am
Simple merge