diff --git a/api/boinc_api.cpp b/api/boinc_api.cpp
index c29fc77f58..0dcdf163e8 100644
--- a/api/boinc_api.cpp
+++ b/api/boinc_api.cpp
@@ -593,6 +593,10 @@ static void exit_from_timer_thread(int status) {
     );
 #endif
 #ifdef _WIN32
+    // TerminateProcess() doesn't work if there are suspended threads?
+    if (boinc_status.suspended) {
+        retval = resume_activities();
+    }
     // this seems to work OK on Windows
     //
     boinc_exit(status);
diff --git a/checkin_notes b/checkin_notes
index 792ab81eba..220fc14bd8 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1507,8 +1507,8 @@ Charlie  2 Mar 2010
 
 Charlie  2 Mar 2010
     - MGR: Keep getting messages even if the Event Log is not open; otherwise 
-        some may be lost due to the limited size of the client's buffer, causing 
-        gaps when the Event Log is later opened.
+        some may be lost due to the limited size of the client's buffer,
+        causing gaps when the Event Log is later opened.
         
     clientgui/
         MainDocument.cpp
@@ -1519,3 +1519,14 @@ Rom    2 Mar 2010
         
     client/
         hostinfo_win.cpp
+
+David  2 Mar 2010
+    - API: Win: resume other threads before exiting from timer thread.
+        Attempt to fix E@h bug.
+    - client: fix messages: asking for X instances doesn't mean
+        that X instances are idle
+
+    api/
+        boinc_api.cpp
+    client/
+        scheduler_op.cpp
diff --git a/client/scheduler_op.cpp b/client/scheduler_op.cpp
index 0253639aff..358690e808 100644
--- a/client/scheduler_op.cpp
+++ b/client/scheduler_op.cpp
@@ -251,18 +251,18 @@ int SCHEDULER_OP::start_rpc(PROJECT* p) {
     }
     if (log_flags.sched_op_debug) {
         msg_printf(p, MSG_INFO,
-            "[sched_op_debug] CPU work request: %.2f seconds; %.2f idle CPUs",
+            "[sched_op_debug] CPU work request: %.2f seconds; %.2f CPUs",
             cpu_work_fetch.req_secs, cpu_work_fetch.req_instances
         );
         if (coproc_cuda) {
             msg_printf(p, MSG_INFO,
-                "[sched_op_debug] NVIDIA GPU work request: %.2f seconds; %.2f idle GPUs",
+                "[sched_op_debug] NVIDIA GPU work request: %.2f seconds; %.2f GPUs",
                 cuda_work_fetch.req_secs, cuda_work_fetch.req_instances
             );
         }
         if (coproc_ati) {
             msg_printf(p, MSG_INFO,
-                "[sched_op_debug] ATI GPU work request: %.2f seconds; %.2f idle GPUs",
+                "[sched_op_debug] ATI GPU work request: %.2f seconds; %.2f GPUs",
                 ati_work_fetch.req_secs, ati_work_fetch.req_instances
             );
         }
diff --git a/doc/links.php b/doc/links.php
index c1a9785f04..ba5da2fdd8 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -250,6 +250,7 @@ language("French", array(
     site("http://www.boinc-af.org", "L'Alliance Francophone"),
 ));
 language("German", array(
+    site("http://www.crunchers-freiburg.de/", "crunchers@freiburg"),
     //site("http://www.boinc-gemeinschaft.de/", "BOINC Gemeinschaft"),
     site("http://www.gridcommunity.de/index.php", "International Grid Community"),
     site("http://www.swissteam.net/", "SwissTeam.net"),