From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 4 Oct 2012 07:55:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: dbus-1.7.0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=778e2a5a91a12a827f283dd267ab1cfbf211734e;p=thirdparty%2Fdbus.git

Merge remote-tracking branch 'origin/master'
---

778e2a5a91a12a827f283dd267ab1cfbf211734e