Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 13:52:37 +0000 (14:52 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 5 Aug 2011 13:52:37 +0000 (14:52 +0100)
commita1c90cacfa6e4e176bffb85a8880dd829f1e3acb
tree0f191829bb12a291fe1dfe453180b16f5130210d
parentd6ad37c3044ed6c72bf652c6e505c6ad9aa9e889
parent6c6ae1efcd9c3d2f43bf282d90cfc5f2d7e0b0e7
Merge branch 'dbus-1.4'

Conflicts:
bus/main.c
bus/main.c
test/Makefile.am