diff --git a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
index 11ccb980911..08925fe8b40 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.mi.core/ChangeLog
@@ -1,3 +1,16 @@
+2003-08-20 Alain Magloire
+
+	GDB/MI altough define an interface that all commands should
+	follow .. they do not.  For example, we should be able
+	to separate options from agument with a "--" string not
+	all commands.  The latest is -break-condition.
+	So we override the MICommand.toString() to do specific
+	parsing for specific commands.
+
+	* src/org/eclipse/cdt/debug/mi/core/command/MICommand.java
+	break the toString() method.
+	* src/org/eclipse/cdt/debug/mi/core/command/MIBreakCondition.java
+
 2003-08-19 Alain Magloire
 
 	Fix to the GDBTypeParser to deal with gdb
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
index aef21ba2754..61d200622a5 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SourceManager.java
@@ -235,6 +235,8 @@ public class SourceManager extends SessionObject implements ICDISourceManager {
 		Type headType = null;
 		Type type = null;
 
+		// Convert the GDBType to an ICDIType.
+		// So we go through the gdbType tree and reconstruct an ICDIType tree
 		for (Type aType = null; gdbType != null; type = aType) {
 			if (gdbType instanceof GDBDerivedType) {
 				switch(gdbType.getType()) {