Merge branch 'dbus-1.4'

Conflicts:
	NEWS

diff --cc NEWS
index 63a69cb,5f6878b..ef1a099
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,25 -1,21 +1,43 @@@
 -D-Bus 1.4.10 (UNRELEASED)
++D-Bus 1.5.2 (UNRELEASED)
+ ==
+ 
+ Notes for distributors:
+ 
+   This version of D-Bus no longer uses -fPIE by default. Distributions wishing
+   to harden the dbus-daemon and dbus-launch-helper can re-enable this if their
+   toolchain supports it reliably, via something like:
+ 
+     ./configure CFLAGS=-fPIE LDFLAGS="-pie -Wl,-z,relro"
+ 
+   or by using distribution-specific wrappers such as Debian's hardening-wrapper.
+ 
+ Changes:
+ 
+   • Don't force -fPIE: distributions and libtool know better than we do whether
+     it's desirable (fd.o #16621, fd.o #27215; Simon McVittie)
+ 
 +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 configure.ac
Simple merge