Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 16:15:41 +0000 (17:15 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 16:15:41 +0000 (17:15 +0100)
commitc99ead074a5c0917716c28c2ff1dc2e0c74a1b53
tree0409b8083ee45e591cf143db8c273df7341413d6
parent22b821bf4a806192f891ee1f33b541b61ea03510
parent75cecfc374b770578e85be0df74be0ec8c4710b8
Merge branch 'dbus-1.4'