diff -Nru bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/bzrlib/transport/ssh.py bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/bzrlib/transport/ssh.py
--- bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/bzrlib/transport/ssh.py	2015-09-30 16:46:32.000000000 +0000
+++ bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/bzrlib/transport/ssh.py	2015-10-05 14:02:28.000000000 +0000
@@ -26,6 +26,7 @@
 import socket
 import subprocess
 import sys
+from binascii import hexlify
 
 from bzrlib import (
     config,
@@ -276,6 +277,9 @@
 class ParamikoVendor(SSHVendor):
     """Vendor that uses paramiko."""
 
+    def _hexify(self, s):
+        return hexlify(s).upper()
+
     def _connect(self, username, password, host, port):
         global SYSTEM_HOSTKEYS, BZR_HOSTKEYS
 
@@ -289,16 +293,14 @@
             self._raise_connection_error(host, port=port, orig_error=e)
 
         server_key = t.get_remote_server_key()
-        server_key_hex = paramiko.util.hexify(server_key.get_fingerprint())
+        server_key_hex = self._hexify(server_key.get_fingerprint())
         keytype = server_key.get_name()
         if host in SYSTEM_HOSTKEYS and keytype in SYSTEM_HOSTKEYS[host]:
             our_server_key = SYSTEM_HOSTKEYS[host][keytype]
-            our_server_key_hex = paramiko.util.hexify(
-                our_server_key.get_fingerprint())
+            our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
         elif host in BZR_HOSTKEYS and keytype in BZR_HOSTKEYS[host]:
             our_server_key = BZR_HOSTKEYS[host][keytype]
-            our_server_key_hex = paramiko.util.hexify(
-                our_server_key.get_fingerprint())
+            our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
         else:
             trace.warning('Adding %s host key for %s: %s'
                           % (keytype, host, server_key_hex))
@@ -308,8 +310,7 @@
             else:
                 BZR_HOSTKEYS.setdefault(host, {})[keytype] = server_key
             our_server_key = server_key
-            our_server_key_hex = paramiko.util.hexify(
-                our_server_key.get_fingerprint())
+            our_server_key_hex = self._hexify(our_server_key.get_fingerprint())
             save_host_keys()
         if server_key != our_server_key:
             filename1 = os.path.expanduser('~/.ssh/known_hosts')
@@ -505,7 +506,7 @@
         agent = paramiko.Agent()
         for key in agent.get_keys():
             trace.mutter('Trying SSH agent key %s'
-                         % paramiko.util.hexify(key.get_fingerprint()))
+                         % self._hexify(key.get_fingerprint()))
             try:
                 paramiko_transport.auth_publickey(username, key)
                 return
diff -Nru bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest
--- bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest	2015-09-30 16:49:32.000000000 +0000
+++ bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/debian/bzr-builder.manifest	2015-10-05 14:06:21.000000000 +0000
@@ -1,4 +1,4 @@
-# bzr-builder format 0.3 deb-version {debupstream-base}bzr6605.6332~ppa4079
-lp:bzr revid:pqm@pqm.ubuntu.com-20150930164321-ct2v2qnmvimqt8qf
+# bzr-builder format 0.3 deb-version {debupstream-base}bzr6606.6332~ppa4079
+lp:bzr revid:pqm@pqm.ubuntu.com-20151005134500-v244rho557tv0ukd
 merge packaging lp:~debian-bazaar/bzr/2.6 revid:a.starr.b@gmail.com-20131008141212-ag9pr3l9qd4eggve
 merge translations lp:~bzr-core/bzr/bzr-translations-export revid:launchpad_translations_on_behalf_of_bzr-core-20150814043032-cpi8b3dqwk1u7mcj
diff -Nru bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/debian/changelog bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/debian/changelog
--- bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/debian/changelog	2015-09-30 16:49:32.000000000 +0000
+++ bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/debian/changelog	2015-10-05 14:06:21.000000000 +0000
@@ -1,8 +1,8 @@
-bzr (2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1) precise; urgency=low
+bzr (2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1) precise; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Wed, 30 Sep 2015 16:49:32 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Mon, 05 Oct 2015 14:06:21 +0000
 
 bzr (2.6.0+bzr6589-1) UNRELEASED; urgency=low
 
diff -Nru bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_patches bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_patches
--- bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_patches	2015-09-30 16:49:32.000000000 +0000
+++ bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_patches	2015-10-05 14:06:21.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-995191/chroot-autobuild/home/buildd/work/tree/bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/debian/patches
+/home/buildd/build-RECIPEBRANCHBUILD-997429/chroot-autobuild/home/buildd/work/tree/bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/debian/patches
diff -Nru bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_series bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_series
--- bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_series	2015-09-30 16:49:32.000000000 +0000
+++ bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/.pc/.quilt_series	2015-10-05 14:06:21.000000000 +0000
@@ -1 +1 @@
-/home/buildd/build-RECIPEBRANCHBUILD-995191/chroot-autobuild/home/buildd/work/tree/bzr-2.6.0+bzr6605.6332~ppa4079~ubuntu12.04.1/debian/patches/series
+/home/buildd/build-RECIPEBRANCHBUILD-997429/chroot-autobuild/home/buildd/work/tree/bzr-2.6.0+bzr6606.6332~ppa4079~ubuntu12.04.1/debian/patches/series