Merge remote-tracking branch 'origin/dbus-1.4' into dbus-1.4
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:18:35 +0000 (19:18 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 26 Apr 2011 18:18:35 +0000 (19:18 +0100)

Trivial merge