Merge branch 'serverdata-33277' into dbus-1.4
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Feb 2011 15:14:29 +0000 (15:14 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Feb 2011 15:14:31 +0000 (15:14 +0000)
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

Trivial merge