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)
commit9fee6d735ec674faab98379511257669f93b9ae7
tree46f053ce582ae6592206fdec79829ae1abd4ec90
parent3a380137c0f342585b9259b5d005c89d89a2e8b5
parent4fa3a89d3255649169f55e3bb55b05b9ef4029a1
Merge branch 'serverdata-33277' into dbus-1.4

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>