Index: openmp/trunk/runtime/src/dllexports
===================================================================
--- openmp/trunk/runtime/src/dllexports
+++ openmp/trunk/runtime/src/dllexports
@@ -186,15 +186,15 @@
         __kmp_omp_debug_struct_info             DATA
     %endif
 
-        # Symbols for MS mutual detection:
-        _You_must_link_with_exactly_one_OpenMP_library    DATA
-        _You_must_link_with_Intel_OpenMP_library          DATA
-        %ifdef msvc_compat
-            _You_must_link_with_Microsoft_OpenMP_library  DATA
-        %endif
+    # Symbols for MS mutual detection:
+    _You_must_link_with_exactly_one_OpenMP_library    DATA
+    _You_must_link_with_Intel_OpenMP_library          DATA
+    %ifdef msvc_compat
+        _You_must_link_with_Microsoft_OpenMP_library  DATA
+    %endif
 
-        __kmp_wait_64
-        __kmp_release_64
+    __kmp_wait_64
+    __kmp_release_64
 
 
 #    VT_getthid                              1
Index: openmp/trunk/runtime/src/kmp_runtime.c
===================================================================
--- openmp/trunk/runtime/src/kmp_runtime.c
+++ openmp/trunk/runtime/src/kmp_runtime.c
@@ -531,7 +531,6 @@
 #ifdef KMP_DYNAMIC_LIB
 # if KMP_OS_WINDOWS
 
-
 static void
 __kmp_reset_lock( kmp_bootstrap_lock_t* lck ) {
     // TODO: Change to __kmp_break_bootstrap_lock().
Index: openmp/trunk/runtime/src/kmp_tasking.c
===================================================================
--- openmp/trunk/runtime/src/kmp_tasking.c
+++ openmp/trunk/runtime/src/kmp_tasking.c
@@ -1420,6 +1420,7 @@
         }
 #endif
 
+        // Debugger: The taskwait is active. Store location and thread encountered the taskwait.
 #if USE_ITT_BUILD
         // Note: These values are used by ITT events as well.
 #endif /* USE_ITT_BUILD */
@@ -1452,6 +1453,7 @@
 #endif /* USE_ITT_BUILD */
 
         // GEH TODO: shouldn't we have some sort of OMPRAP API calls here to mark end of wait?
+        // Debugger:  The taskwait is completed. Location remains, but thread is negated.
         taskdata->td_taskwait_thread = - taskdata->td_taskwait_thread;
 
 #if OMPT_SUPPORT && OMPT_TRACE
@@ -1494,6 +1496,7 @@
         thread = __kmp_threads[ gtid ];
         taskdata = thread -> th.th_current_task;
         // Should we model this as a task wait or not?
+        // Debugger: The taskwait is active. Store location and thread encountered the taskwait.
 #if USE_ITT_BUILD
         // Note: These values are used by ITT events as well.
 #endif /* USE_ITT_BUILD */
@@ -1521,6 +1524,7 @@
 #endif /* USE_ITT_BUILD */
 
         // GEH TODO: shouldn't we have some sort of OMPRAP API calls here to mark end of wait?
+        // Debugger:  The taskwait is completed. Location remains, but thread is negated.
         taskdata->td_taskwait_thread = - taskdata->td_taskwait_thread;
     }