Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 12 Apr 2011 10:27:09 +0000 (11:27 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 12 Apr 2011 10:27:09 +0000 (11:27 +0100)

Trivial merge