diff --git a/checkin_notes b/checkin_notes
index 33c6c7ea14..0dea5196f5 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7775,3 +7775,12 @@ Rom    25 Oct 2011
     /
         configure.ac
         version.h
+
+David  26 Oct 2011
+    - web: typo in forum RSS from Daniel L G; fixes #1147
+    - client: message tweak
+
+    html/inc/
+        forum_rss.inc
+    client/
+        cpu_sched.cpp
diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp
index ae8261c7fd..e49403ceb6 100644
--- a/client/cpu_sched.cpp
+++ b/client/cpu_sched.cpp
@@ -1559,7 +1559,7 @@ bool CLIENT_STATE::enforce_run_list(vector<RESULT*>& run_list) {
             if (ncpus_used >= ncpus) {
                 if (log_flags.cpu_sched_debug) {
                     msg_printf(rp->project, MSG_INFO,
-                        "[cpu_sched_debug] all CPUs used (%.2f > %d), skipping %s",
+                        "[cpu_sched_debug] all CPUs used (%.2f >= %d), skipping %s",
                         ncpus_used, ncpus,
                         rp->name
                     );
diff --git a/html/inc/forum_rss.inc b/html/inc/forum_rss.inc
index 79f973caec..95b01c43bb 100644
--- a/html/inc/forum_rss.inc
+++ b/html/inc/forum_rss.inc
@@ -66,7 +66,7 @@ function forum_rss($forumid, $userid, $truncate, $threads_only, $ndays) {
     if ($threads_only) {
         $q = "$clause and hidden=0 and create_time > $tlimit order by create_time desc";
     } else {
-        $q = "$clause and hidden=0 and and timestamp > $tlimit order by timestamp desc";
+        $q = "$clause and hidden=0 and timestamp > $tlimit order by timestamp desc";
     }
 
     $threads = BoincThread::enum($q);