Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	dbus/dbus-internals.c
	dbus/dbus-mainloop.c
	dbus/dbus-sysdeps-unix.c
	dbus/dbus-sysdeps-win.c
	dbus/dbus-sysdeps.c
	dbus/dbus-sysdeps.h

diff --cc NEWS
index d0ad049d76229949b273d82608842eceb8420ab7,187b215d18ab868d6e2ee9287b18ab369e398c6d..74566f9968b32843427ce8787a5b8a4d582e6973
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,20 -1,31 +1,26 @@@
 -D-Bus 1.4.22 (UNRELEASED)
 +D-Bus 1.5.14 (UNRELEASED)
  ==
  
- ...
+ Changes:
+ 
+ • Be more careful about monotonic time vs. real time, fixing DBUS_COOKIE_SHA1
+   spec-compliance (fd.o #48580, David Zeuthen)
+ 
+ • Don't use install(1) within the source/build trees, fixing the build as
+   non-root when using OpenBSD install(1) (fd.o #48217, Antoine Jacoutot)
  
 -D-Bus 1.4.20 (2012-03-27)
 +D-Bus 1.5.12 (2012-03-27)
  ==
  
 -The “Nikolai Tesla and You” release.
 +The “Big Book of Science” release.
  
 -Dependencies:
 +• 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)
  
 -• 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)

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

diff --cc test/Makefile.am
Simple merge