From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 5 Sep 2013 12:12:36 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.8.2~163
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8e180476f1b9f8d0149542b740b577169863cf8;p=platform%2Fupstream%2Fdbus.git

Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	tools/run-with-tmp-session-bus.sh
---

f8e180476f1b9f8d0149542b740b577169863cf8