Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac

diff --cc NEWS
index 746eee403f672358906f06cc56dde8a9e5af4e3a,6ee76fefcb29232f5e0c4e52e1f67f4507aefd51..aefec3f20a999046753a16bd86c36c26b24fbeb2
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,4 -1,4 +1,4 @@@
- D-Bus 1.5.2 (UNRELEASED)
 -D-Bus 1.4.10 (2011-06-01)
++D-Bus 1.5.2 (2011-06-01)
  ==
  
  Notes for distributors:

diff --cc configure.ac
index c43fe73377ce22ec11deb9dafa2518853b331964,a041c55f840ebf9562ef7d521ca3421d1dbbc7d5..860667a3cc6e9426cf5d05d596b5e2d17ee42609
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -2,8 -2,8 +2,8 @@@ dnl -*- mode: m4 -*
  AC_PREREQ([2.63])
  
  m4_define([dbus_major_version], [1])
 -m4_define([dbus_minor_version], [4])
 -m4_define([dbus_micro_version], [11])
 +m4_define([dbus_minor_version], [5])
- m4_define([dbus_micro_version], [1])
++m4_define([dbus_micro_version], [2])
  m4_define([dbus_version],
            [dbus_major_version.dbus_minor_version.dbus_micro_version])
  AC_INIT([dbus],[dbus_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=dbus],[dbus])
@@@ -36,7 -36,7 +36,7 @@@ LT_CURRENT=
  
  ## increment any time the source changes; set to
  ##  0 if you increment CURRENT
- LT_REVISION=0
 -LT_REVISION=6
++LT_REVISION=1
  
  ## increment if any interfaces have been added; set to 0
  ## if any interfaces have been changed or removed. removal has