Merge commit 'dkg/master'

Conflicts:

	src/seckey2sshagent

diff --git a/src/seckey2sshagent b/src/seckey2sshagent
index 15e2706ff444aa04aa5c4cf6a68aa11f10d12ab4..aff323f4d7de90eefd733ca4f99e3621efadf409 100755 (executable)
--- a/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@ -46,4 +46,6 @@ gpg --export-secret-key $GPGID | GNUPGHOME="$FOO" gpg --import
 
 GNUPGHOME="$FOO" gpg --edit-key $GPGID
 
+ln -s /dev/stdin "$FOO"/monkeysphere-key
+
 GNUPGHOME="$FOO" gpg --export-secret-key $GPGID | openpgp2ssh $GPGID | ssh-add -c /dev/stdin