From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 23 Jan 2012 11:14:45 +0000 (+0000)
Subject: Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5
X-Git-Tag: dbus-1.5.10~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b080ba1eab764b79edb62afcfc61794f410a5591;p=platform%2Fupstream%2Fdbus.git

Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5

Conflicts:
	configure.ac
---

b080ba1eab764b79edb62afcfc61794f410a5591