From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 15 Jun 2012 15:03:49 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.0~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9073e06039537c9633d55402ee8385b0375bd447;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'
---

9073e06039537c9633d55402ee8385b0375bd447