Merge mterrys changes to the PATH mangling for gdmflexiserver

author Robert Ancell <robert.ancell@canonical.com>

Thu, 18 Aug 2011 00:11:39 +0000 (10:11 +1000)

committer Robert Ancell <robert.ancell@canonical.com>

Thu, 18 Aug 2011 00:11:39 +0000 (10:11 +1000)
author Robert Ancell <robert.ancell@canonical.com>
Thu, 18 Aug 2011 00:11:39 +0000 (10:11 +1000)
committer Robert Ancell <robert.ancell@canonical.com>
Thu, 18 Aug 2011 00:11:39 +0000 (10:11 +1000)
diff --cc src/display.c
Simple merge
diff --cc src/session.c
Simple merge
author	Robert Ancell <robert.ancell@canonical.com>
	Thu, 18 Aug 2011 00:11:39 +0000 (10:11 +1000)
committer	Robert Ancell <robert.ancell@canonical.com>
	Thu, 18 Aug 2011 00:11:39 +0000 (10:11 +1000)
		1	2
src/display.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/session.c	patch \|	diff1 \|	diff2 \|	blob \| history