Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 10 Mar 2011 12:15:56 +0000 (12:15 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 10 Mar 2011 12:15:56 +0000 (12:15 +0000)
commit24cdbddbe6d6556d8b6eb8c689bf232c946782e0
treeec8c50a26eeb0b88d57ef92568855573b3c107b8
parent257a6ef4963af05dfdd0ce45713994f562da07c9
parenteb6d268f581801d829f762daae399726e32a7b62
Merge branch 'dbus-1.4'