diff --git a/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties b/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
index 5854f2d182e..fced3d3bb9f 100644
--- a/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
+++ b/org.eclipse.tm.terminal.ssh-feature/sourceTemplatePlugin/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal SSH Connector Source\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF b/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
index ac99ae31423..fd9a95ad4f4 100644
--- a/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.tm.terminal.ssh/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.ssh;singleton:=true
-Bundle-Version: 2.0.100.qualifier
+Bundle-Version: 2.0.200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.tm.terminal.ssh/about.properties b/org.eclipse.tm.terminal.ssh/about.properties
index b4eb8f46c78..8ed50bff8e6 100644
--- a/org.eclipse.tm.terminal.ssh/about.properties
+++ b/org.eclipse.tm.terminal.ssh/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal SSH Connector\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2000, 2009.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2000, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
index 3aa99536803..8a1e21ad7bb 100644
--- a/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
+++ b/org.eclipse.tm.terminal.ssh/src/org/eclipse/tm/internal/terminal/ssh/SshSettings.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 Wind River Systems, Inc. and others.
+ * Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials 
  * are made available under the terms of the Eclipse Public License v1.0 
  * which accompanies this distribution, and is available at 
@@ -10,6 +10,7 @@
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  * Mikhail Kalugin <fourdman@xored.com> - [201867] Improve Terminal SSH connection summary string
  * Johnson Ma (Wind River) - [218880] Add UI setting for ssh keepalives
+ *  Bryan Hunt - [313991] cannot programatically pass password to SshConnector
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.ssh;
 
@@ -41,6 +42,10 @@ public class SshSettings implements ISshSettings {
 	public void load(ISettingsStore store) {
 		fHost = store.get("Host");//$NON-NLS-1$
 		fUser = store.get("User");//$NON-NLS-1$
+		// ISettingsStore providers have to make sure that
+		// the password is not saved in some as plain text
+		// on disk. [bug 313991] 
+		fPassword = store.get("Password");//$NON-NLS-1$
 		fPort = store.get("Port");//$NON-NLS-1$
 		fTimeout = store.get("Timeout");//$NON-NLS-1$
 		fKeepalive = store.get("Keepalive");//$NON-NLS-1$
@@ -51,6 +56,9 @@ public class SshSettings implements ISshSettings {
 		store.put("Host", fHost);//$NON-NLS-1$
 		store.put("User", fUser);//$NON-NLS-1$
 		store.put("Port", fPort);//$NON-NLS-1$
+		// We do *not* store the password in the settings because
+		// this can cause the password to be stored as plain text
+		// in some settings file
 		store.put("Timeout", fTimeout);//$NON-NLS-1$
 		store.put("Keepalive", fKeepalive);//$NON-NLS-1$
 	}