From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 2 Feb 2011 15:15:01 +0000 (+0000)
Subject: Merge branch 'dist-30285' into dbus-1.4
X-Git-Tag: dbus-1.4.4~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0e8ae3b77e5ec33e5661f82320cdef4466a9f9d;p=thirdparty%2Fdbus.git

Merge branch 'dist-30285' into dbus-1.4

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

a0e8ae3b77e5ec33e5661f82320cdef4466a9f9d