Merge branch 'require-display-for-autolaunch-19997' into dbus-1.4
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 25 Feb 2011 11:31:29 +0000 (11:31 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 25 Feb 2011 12:01:33 +0000 (12:01 +0000)
commitbe5e2b23c93b3d93d8d02f3870618c29f3737239
tree519a4a7a75df5b129e4025b37a7b478c9f9edb2f
parent20d2f1702fc602d70fc2ed7a016289679106098e
parentf04e52a2e5402a2bd17a5e923402df8e79dfd940
Merge branch 'require-display-for-autolaunch-19997' into dbus-1.4

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