From: Will Thompson <will.thompson@collabora.co.uk>
Date: Tue, 22 Jun 2010 16:25:20 +0000 (+0100)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5d64b7a1b792789fd1d41ad99624b578dddcf4b4;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.2'
---

5d64b7a1b792789fd1d41ad99624b578dddcf4b4