From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 24 Feb 2011 18:40:31 +0000 (+0000)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.4.8~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31a1b24c933c16f026e9e842f80273b484b44e36;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.4'
---

31a1b24c933c16f026e9e842f80273b484b44e36