From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 8 Jun 2011 10:38:21 +0000 (+0100)
Subject: Merge branch 'dbus-1.4'
X-Git-Tag: dbus-1.5.4~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=963a38d0b1eb17abadc5e83028f861b1c2be8d8a;p=platform%2Fupstream%2Fdbus.git

Merge branch 'dbus-1.4'
---

963a38d0b1eb17abadc5e83028f861b1c2be8d8a