diff --git a/checkin_notes b/checkin_notes
index fe4d845aa1..d41ef65f45 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4939,3 +4939,13 @@ Rom    6 July 2010
     
     clientgui/
         NoticeListCtrl.cpp, .h
+
+David  6 Jul 2010
+    - client: don't consider a result "nearly runnable"
+        if one of its downloads is stalled.
+        This fixes a situation that can cause processor or GPU
+        idleness when download servers are down for a while
+
+    client/
+        work_fetch.cpp
+
diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp
index a7cbbedabb..f71ade3d42 100644
--- a/client/work_fetch.cpp
+++ b/client/work_fetch.cpp
@@ -1273,6 +1273,7 @@ bool RESULT::downloading() {
     if (suspended_via_gui) return false;
     if (project->suspended_via_gui) return false;
     if (state() > RESULT_FILES_DOWNLOADING) return false;
+    if (some_download_stalled()) return false;
     return true;
 }