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)
Reviewed-by: Colin Walters <walters@verbum.org>
1  2 
configure.ac

diff --cc configure.ac
Simple merge