From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 14 Jan 2011 15:19:18 +0000 (+0000)
Subject: Merge branch 'tmp'
X-Git-Tag: dbus-1.4.4~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84d4ed242ac0ca9cc9ade4c09539d71edd061541;p=thirdparty%2Fdbus.git

Merge branch 'tmp'

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32854
---

84d4ed242ac0ca9cc9ade4c09539d71edd061541