From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 26 Apr 2011 18:18:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/dbus-1.4' into dbus-1.4
X-Git-Tag: dbus-1.4.10~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2ebdf245569cc47bf53d2e15ee976e2b091905;p=thirdparty%2Fdbus.git

Merge remote-tracking branch 'origin/dbus-1.4' into dbus-1.4
---

de2ebdf245569cc47bf53d2e15ee976e2b091905