diff --git a/lldb/test/conditional_break/conditional_break.py b/lldb/test/conditional_break/conditional_break.py
index 0a3a8b3e84e6..ea4492e2713e 100644
--- a/lldb/test/conditional_break/conditional_break.py
+++ b/lldb/test/conditional_break/conditional_break.py
@@ -3,15 +3,27 @@ import lldb
 import lldbutil
 
 def stop_if_called_from_a():
+    # lldb.debugger_unique_id stores the id of the debugger associated with us.
     dbg = lldb.SBDebugger.FindDebuggerWithID(lldb.debugger_unique_id)
+
+    # Perform synchronous interaction with the debugger.
     dbg.SetAsync(False)
+
+    # Get the command interpreter.
     ci = dbg.GetCommandInterpreter()
+
+    # And the result object for ci interaction.
     res = lldb.SBCommandReturnObject()
 
+    # Retrieve the target, process, and the only thread.
     target = dbg.GetSelectedTarget()
     process = target.GetProcess()
     thread = process.GetThreadAtIndex(0)
 
+    # We check the call frames in order to stop only when the immediate caller
+    # of the leaf function c() is a().  If it's not the right caller, we ask the
+    # command interpreter to continue execution.
+
     print >> sys.stderr, "Checking call frames..."
     lldbutil.PrintStackTrace(thread)
     if thread.GetNumFrames() >= 2:
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 86fb7373940a..b7a71df71294 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -12,6 +12,12 @@ a module which implements a test scenario, namely, Test*.py.
 To specify the directories where "Test*.py" python test scripts are located,
 you need to pass in a list of directory names.  By default, the current
 working directory is searched if nothing is specified on the command line.
+
+Type:
+
+./dotest.py -h
+
+for available options.
 """
 
 import os, signal, sys, time