diff --git a/checkin_notes b/checkin_notes
index 51d6f7d713..a5dd971179 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8480,9 +8480,16 @@ Charlie 14 Nov 2011
         sg_BoincSimpleFrame.cpp
         sg_TaskPanel.cpp,.h
 
-Charlie 9 Nov 2011
+Charlie 14 Nov 2011
     - MGR: Limit change of 9 November to only Debug builds: accept and 
         ignore command line argument "-NSDocumentRevisionsDebugMode=YES"
 
     clientgui/
         BOINCGUIApp.cpp
+
+David  14 Nov 2011
+	- client: add some missing items to CONFIG::parse_options_client().
+
+	client/
+		log_flags.cpp
+		pers_file_xfer.cpp
diff --git a/client/log_flags.cpp b/client/log_flags.cpp
index e5c12e40b0..918d907399 100644
--- a/client/log_flags.cpp
+++ b/client/log_flags.cpp
@@ -327,6 +327,7 @@ int CONFIG::parse_options_client(XML_PARSER& xp) {
             continue;
         }
         if (xp.parse_bool("exit_after_finish", exit_after_finish)) continue;
+        if (xp.parse_bool("exit_before_start", exit_before_start)) continue;
         if (xp.parse_bool("exit_when_idle", exit_when_idle)) {
             if (exit_when_idle) {
                 report_results_immediately = true;
@@ -339,6 +340,8 @@ int CONFIG::parse_options_client(XML_PARSER& xp) {
             continue;
         }
         if (xp.parse_bool("http_1_0", http_1_0)) continue;
+        if (xp.parse_int("http_transfer_timeout", http_transfer_timeout)) continue;
+        if (xp.parse_int("http_transfer_timeout_bps", http_transfer_timeout_bps)) continue;
         if (xp.parse_int("ignore_cuda_dev", n)||xp.parse_int("ignore_nvidia_dev", n)) {
             ignore_nvidia_dev.push_back(n);
             continue;
diff --git a/client/pers_file_xfer.cpp b/client/pers_file_xfer.cpp
index cced84d090..35e5cd14c4 100644
--- a/client/pers_file_xfer.cpp
+++ b/client/pers_file_xfer.cpp
@@ -331,7 +331,6 @@ void PERS_FILE_XFER::transient_failure(int retval) {
 
     // Cycle to the next URL to try.
     // If we reach the URL that we started at, then back off.
-    // Otherwise immediately try the next URL
     //
 
     URL_LIST& ul = fip->get_url_list(is_upload);