diff --git a/checkin_notes b/checkin_notes
index b2b2b80f8f..ebc01f11aa 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6262,6 +6262,11 @@ David  14 June 2007
         sched_hr.C
         sched_config.C,h
 
+
+Rom    14 June 2007
+    - Branch for 5.10 release, all platforms
+      boinc_core_release_5_10
+
 David  14 June 2007
     - scheduler: support per-app HR type, specified in the DB;
         this supercedes the global HR type specified in config.xml
@@ -6309,3 +6314,19 @@ David  14 June 2007
             create_account_form.php (removed)
             create_account_action.php (removed)
             show_log.php
+
+Rom    16 June 2007
+    - WINSETUP: Remove the VBS Script custom action and put back
+        the shortcut to BOINC Manager.
+        
+    win_build/installerv2/
+        BOINC.ism
+        BOINCx64.ism
+
+Rom    16 June 2007
+    - MGR: Revert back out the change to cache the host type
+        (local/remote). Somehow it was messing up controlling
+        remote machines.
+
+    clientgui/
+        MainDocument.cpp, .h
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 8dc7ddffea..a4fbd97263 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -53,7 +53,6 @@ CNetworkConnection::CNetworkConnection(CMainDocument* pDocument) :
     m_bReconnectOnError = false;
     m_bNewConnection = false;
     m_bUsedDefaultPassword = false;
-    m_bIdentifyHostType = true;
 }
 
 
@@ -187,24 +186,18 @@ int CNetworkConnection::GetConnectingComputerName(wxString& strMachine) {
 
 
 bool CNetworkConnection::IsComputerNameLocal(const wxString& strMachine) {
-    static bool bLocalHostName = true;
-
-    if (m_bIdentifyHostType) {
-        if (strMachine.empty()) {
-            bLocalHostName = true;
-        } else if (wxT("localhost") == strMachine.Lower()) {
-            bLocalHostName = true;
-        } else if (wxT("localhost.localdomain") == strMachine.Lower()) {
-            bLocalHostName = true;
-        } else if (::wxGetHostName().Lower() == strMachine.Lower()) {
-            bLocalHostName = true;
-        } else if (::wxGetFullHostName().Lower() == strMachine.Lower()) {
-            bLocalHostName = true;
-        }
-        m_bIdentifyHostType = false;
+    if (strMachine.empty()) {
+        return true;
+    } else if (wxT("localhost") == strMachine.Lower()) {
+        return true;
+    } else if (wxT("localhost.localdomain") == strMachine.Lower()) {
+        return true;
+    } else if (::wxGetHostName().Lower() == strMachine.Lower()) {
+        return true;
+    } else if (::wxGetFullHostName().Lower() == strMachine.Lower()) {
+        return true;
     }
-
-    return bLocalHostName;
+    return false;
 }
 
 
diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h
index 33b5353717..ee557f1ad8 100644
--- a/clientgui/MainDocument.h
+++ b/clientgui/MainDocument.h
@@ -64,7 +64,6 @@ private:
     bool           m_bUseDefaultPassword;
     bool           m_bUsedDefaultPassword;
     bool           m_bNewConnection;
-    bool           m_bIdentifyHostType;
     wxString       m_strNewComputerName;
     wxString       m_strNewComputerPassword;
     wxString       m_strConnectedComputerName;
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 8ebc2444cf..8c93a50d8c 100644
Binary files a/win_build/installerv2/BOINC.ism and b/win_build/installerv2/BOINC.ism differ
diff --git a/win_build/installerv2/BOINCx64.ism b/win_build/installerv2/BOINCx64.ism
index 39a1e6cfc5..50601e88e5 100644
Binary files a/win_build/installerv2/BOINCx64.ism and b/win_build/installerv2/BOINCx64.ism differ