Merge branch 'dist-30285' into dbus-1.4
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Feb 2011 15:15:01 +0000 (15:15 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 2 Feb 2011 15:15:02 +0000 (15:15 +0000)
commita0e8ae3b77e5ec33e5661f82320cdef4466a9f9d
tree0de6ca446e732948a2c2bd5228a848acfee53e6a
parent9fee6d735ec674faab98379511257669f93b9ae7
parentf7ecd2fb8b4f2bc9ed83b9b5ffc46566cefd6e31
Merge branch 'dist-30285' into dbus-1.4

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