Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 27 Jul 2011 17:54:35 +0000 (18:54 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 27 Jul 2011 17:54:35 +0000 (18:54 +0100)

Trivial merge