Merge branch 'dbus-1.4'

diff --cc HACKING
Simple merge

diff --cc NEWS
index a5fe4d7180062ed63b8ee446df5c0e7b2a949b67,c717456bf2195780f6dec28242dba01de93cfe14..6ea1dd794ecc5030700d331a49eb48b4fa4c0539
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -25,39 -22,21 +25,45 @@@ Changes
      (fd.o #14512; Simon McVittie, loosely based on a patch from Luca Barbato)
    • Ensure that maintainers upload documentation with the right permissions
      (fd.o #36130, Simon McVittie)
 +  • Don't force users of libdbus to be linked against -lpthread, -lrt
 +    (fd.o #32827, Simon McVittie)
    • Log system-bus activation information to syslog (fd.o #35705,
      Colin Walters)
+   • Make the nonce-tcp transport work on Unix (fd.o #34569, Simon McVittie)
    • On Unix, if /var/lib/dbus/machine-id cannot be read, try /etc/machine-id
      (fd.o #35228, Lennart Poettering)
    • In the regression tests, don't report fds as "leaked" if they were open
      on startup (fd.o #35173, Simon McVittie)
    • Make dbus-monitor bail out if asked to monitor more than one bus,
      rather than silently using the last one (fd.o #26548, Will Thompson)
+   • Clarify documentation (fd.o #35182, Simon McVittie)
+   • Clean up minor dead code and some incorrect error handling
+     (fd.o #33128, fd.o #29881; Simon McVittie)
+   • Windows:
+     • Remove obsolete workaround for winioctl.h (fd.o #35083, Ralf Habacker)
  
 +D-Bus 1.5.0 (2011-04-11)
 +==
 +
 +The "you never know when you need to tow something from your giant
 +flying shark" release.
 +
 +  • D-Bus Specification v0.16
 +    · Add support for path_namespace and arg0namespace in match rules
 +      (fd.o #24317, #34870; Will Thompson, David Zeuthen, Simon McVittie)
 +    · Make argNpath support object paths, not just object-path-like strings,
 +      and document it better (fd.o #31818, Will Thompson)
 +  • Let the bus daemon implement more than one interface (fd.o #33757,
 +    Simon McVittie)
 +  • Optimize _dbus_string_replace_len to reduce waste (fd.o #21261,
 +    Roberto Guido)
 +  • Require user intervention to compile with missing 64-bit support
 +    (fd.o #35114, Simon McVittie)
 +  • Add dbus_type_is_valid as public API (fd.o #20496, Simon McVittie)
 +  • Raise UnknownObject instead of UnknownMethod for calls to methods on
 +    paths that are not part of the object tree, and UnknownInterface for calls
 +    to unknown interfaces in the bus daemon (fd.o #34527, Lennart Poettering)
 +
  D-Bus 1.4.8 (2011-04-08)
  ==
  

diff --cc dbus/dbus-connection.c
Simple merge