From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 25 Feb 2011 11:31:29 +0000 (+0000)
Subject: Merge branch 'require-display-for-autolaunch-19997' into dbus-1.4
X-Git-Tag: dbus-1.4.8~14^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be5e2b23c93b3d93d8d02f3870618c29f3737239;p=thirdparty%2Fdbus.git

Merge branch 'require-display-for-autolaunch-19997' into dbus-1.4

Reviewed-by: Colin Walters <walters@verbum.org>
---

be5e2b23c93b3d93d8d02f3870618c29f3737239