diff -u gnome-terminal-2.29.6/debian/changelog gnome-terminal-2.29.6/debian/changelog
--- gnome-terminal-2.29.6/debian/changelog
+++ gnome-terminal-2.29.6/debian/changelog
@@ -1,3 +1,9 @@
+gnome-terminal (2.29.6-0ubuntu6) lucid; urgency=low
+
+  * src/terminal-screen.c: escape proxy credentials (LP: #130289) 
+
+ -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com>  Mon, 29 Mar 2010 12:04:22 +0200
+
 gnome-terminal (2.29.6-0ubuntu5) lucid; urgency=low
 
   * Revert the previous changes to add a new profile, as changing
diff -u gnome-terminal-2.29.6/debian/control gnome-terminal-2.29.6/debian/control
--- gnome-terminal-2.29.6/debian/control
+++ gnome-terminal-2.29.6/debian/control
@@ -8,7 +8,7 @@
 Priority: optional
 XSBC-Original-Maintainer: Guilherme de S. Pastore <gpastore@debian.org>
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Sebastian Dröge <slomo@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Standards-Version: 3.8.3
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-terminal/ubuntu
 Build-Depends: cdbs (>= 0.4.41),
only in patch2:
unchanged:
--- gnome-terminal-2.29.6.orig/src/terminal-screen.c
+++ gnome-terminal-2.29.6/src/terminal-screen.c
@@ -1391,8 +1391,8 @@
   if (conf_get_bool (conf, HTTP_PROXY_DIR "/use_authentication"))
     {
       char *user, *password;
-      user = conf_get_string (conf, HTTP_PROXY_DIR "/authentication_user");
-      password = conf_get_string (conf, HTTP_PROXY_DIR "/authentication_password");
+      user = g_uri_escape_string(conf_get_string (conf, HTTP_PROXY_DIR "/authentication_user"), NULL, FALSE);
+      password = g_uri_escape_string(conf_get_string (conf, HTTP_PROXY_DIR "/authentication_password"), NULL, FALSE);
       if (user)
 	{
 	  if (password)