Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 10:39:32 +0000 (11:39 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 21 Sep 2011 10:39:32 +0000 (11:39 +0100)
commitbf3d8259ac89ee4fe86b3f9e6df71f6e71e07fd2
treed80925fcf3feaa14b9e7eed571d0ce9e3cf53efc
parentc1989c1a4f013085fe5eceb6bffa89d1e1b66bf5
parentbdfec550544d353e60228b0553534467cbb36a06
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS
bus/activation.c
configure.ac
dbus/dbus-sysdeps-unix.c
dbus/dbus-sysdeps-util-unix.c
test/Makefile.am
test/name-test/Makefile.am