Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 18 Jul 2011 14:15:45 +0000 (15:15 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 18 Jul 2011 14:15:45 +0000 (15:15 +0100)

Trivial merge