Merge remote-tracking branch 'origin/dbus-1.4' into dbus-1.4
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:18:35 +0000 (19:18 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:18:35 +0000 (19:18 +0100)
commitde2ebdf245569cc47bf53d2e15ee976e2b091905
tree4285a429780a57a201f7869ca19db5276f15a521
parenta902c512950e5d4842d25003e0c3ea920be6d7a5
parent1d24cecc41296647b14175779a35c2cdc4d242a7
Merge remote-tracking branch 'origin/dbus-1.4' into dbus-1.4