Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 7 Mar 2011 14:51:46 +0000 (14:51 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 7 Mar 2011 14:51:46 +0000 (14:51 +0000)
commit3013fafae5a6e731ca16b23ea32e96358a8c75f9
treeee6cc1c7057f755e3ba6a96cd3b00918d933b0d7
parent07d2ca2b52570db6591b61b5ca24913d8f936e55
parent2e408182809f58ac03b66989ee0b9d5bbe931edf
Merge branch 'dbus-1.4'