From: Colin Walters <walters@verbum.org>
Date: Tue, 16 Mar 2010 20:44:48 +0000 (-0400)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.1~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18bcf800b65a8ac9de041c5070b3cd4bfb366485;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.2'
---

18bcf800b65a8ac9de041c5070b3cd4bfb366485