From: Colin Walters <walters@verbum.org>
Date: Mon, 1 Feb 2010 22:27:26 +0000 (-0500)
Subject: Merge branch 'my-dbus-1.2'
X-Git-Tag: dbus-1.3.1~120^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6db588b8544e117241a3be2c595dfc8fdcdc8f59;p=thirdparty%2Fdbus.git

Merge branch 'my-dbus-1.2'
---

6db588b8544e117241a3be2c595dfc8fdcdc8f59