Merge commit 'dkg/master'

Conflicts:

	debian/changelog

diff --cc debian/changelog
index b39ba444520ec5feb99e85750b88f9deb27841f8,e6dfccd36bc3158628456f1f34a9ec062f049edb..64c2a09a3aba882e17158f104a50229486a8107d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -5,7 -5,8 +5,7 @@@ monkeysphere (0.8-1) UNRELEASED; urgenc
      of my own.
    * More monkeysphere-server diagnostics
    * monkeysphere --gen-subkey now guesses what KeyID you meant.
--  * set up host-key revocation
+   * added Recommends: ssh-askpass to ensure monkeysphere --gen-subkey works
  
    [ Jameson Graef Rollins ]
    * fix another bug for when ssh key files are missing.

diff --cc src/monkeysphere-server
index 4fb82653818927915b9aecf5d552968c3c06dcfe,2b9b7443c1c4fc44ff4a020fb39ab54dc8b81f64..69395a4dbb449f4b6dee8e85455586aa955d7e7d
--- 1/src/monkeysphere-server
--- 2/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@@ -732,7 -678,7 +732,7 @@@ EO
        )
  
      # ltsign the key
--    echo "$ltsignCommand" | gpg_host --quiet --command-fd 0 --edit-key "$fingerprint"
++    echo "$ltsignCommand" | gpg_host --quiet --command-fd 0 --edit-key "0x${fingerprint}"\!
  
      # update the trustdb for the authentication keyring
      gpg_authentication "--check-trustdb"