Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 58b801d,e03afb0..6496a1e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,38 -1,32 +1,43 @@@
 -D-Bus 1.4.20 (2012-03-27)
 +D-Bus 1.5.11 (UNRELEASED)
  ==
  
 -The “Nikolai Tesla and You” release.
 +• Add public API to validate various string types:
 +  dbus_validate_path(), dbus_validate_interface(), dbus_validate_member(),
 +  dbus_validate_error_name(), dbus_validate_bus_name(), dbus_validate_utf8()
 +  (fd.o #39549, Simon McVittie)
  
 -Dependencies:
 -
 -• The version of GLib required for some of the regression tests has
 -  increased to 2.24.
 -
 -Changes:
 -
 -• Make dbus-protocol.h compatible with C++11 (fd.o #46147, Marc Mutz)
 -
 -• Use GLib 2.31.x thread API, with backwards compatibility to 2.24,
 -  fixing compiler warnings and link failure when using 2.32
 -  (fd.o #44413, Debian #665665; Martin Pitt)
 +• Turn DBusBasicValue into public API so bindings don't need to invent their
 +  own "union of everything" type (fd.o #11191, Simon McVittie)
  
+ • Enumerate data files included in the build rather than using find(1)
+   (fd.o #33840, Simon McVittie)
+ 
  • Windows-specific:
 +  · make dbus-daemon.exe --print-address (and --print-pid) work again
 +    on Win32, but not on WinCE (fd.o #46049, Simon McVittie)
+   · fix duplicate case value when compiling against mingw-w64
+     (fd.o #47321, Andoni Morales Alastruey)
  
 -D-Bus 1.4.18 (2012-02-13)
 +D-Bus 1.5.10 (2012-02-21)
  ==
  
 -The "snow in Brussels" release
 +The "fire in Delerium" release.
 +
 +On Unix platforms, PTHREAD_MUTEX_RECURSIVE (as specified in POSIX 2008 Base
 +and SUSv2) is now required.
 +
 +• D-Bus Specification 0.19:
 +  · Formally define unique connection names and well-known bus names,
 +    and document best practices for interface, bus, member and error names,
 +    and object paths (fd.o #37095, Simon McVittie)
 +  · Document the search path for session and system services on Unix, and
 +    where they should be installed by build systems (fd.o #21620, fd.o #35306;
 +    Simon McVittie)
 +  · Document the systemd transport (fd.o #35232, Lennart Poettering)
 +
 +• Make dbus_threads_init() use the same built-in threading implementation
 +  as dbus_threads_init_default(); the user-specified primitives that it
 +  takes as a parameter are now ignored (fd.o #43744, Simon McVittie)
  
  • Allow all configured auth mechanisms, not just one (fd.o #45106,
    Pavel Strashkin)

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