# HG changeset patch
# User timkelly
# Date 1250542305 18000
# Node ID b6b7ad8a25a38dfaf9a4594cd447a14e7670287e
# Parent  d8439c154fc728abf729698c843785e84d6dd906# Parent  ef1589eec61f2bb30c4ea8f5258a36820f7bd9c6
merge commit

diff -r d8439c154fc7 -r b6b7ad8a25a3 cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java
--- a/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java	Thu Aug 13 17:09:55 2009 -0500
+++ b/cdt/cdt_6_0_x/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/CDebugCorePlugin.java	Mon Aug 17 15:51:45 2009 -0500
@@ -354,6 +354,8 @@
 			fCommonSourceLookupDirector = new CommonSourceLookupDirector();
 			String newMemento = CDebugCorePlugin.getDefault().getPluginPreferences().getString( ICDebugInternalConstants.PREF_COMMON_SOURCE_CONTAINERS );
 			if ( newMemento.length() == 0 ) {
+				fCommonSourceLookupDirector.initializeParticipants();
+
 				// Convert source locations to source containers
 				convertSourceLocations( fCommonSourceLookupDirector );
 			}