Merge commit 'dkg/master'

Conflicts:

	src/monkeysphere-host

diff --cc src/monkeysphere-host
index 31f031ed91618f9e0e3e89e41d0a978484ad83f7,19ab5fcf8e7c84c72c13cff342b0c30872b524c9..94392647c32693ce74bce898debcfd818e69170b
--- 1/src/monkeysphere-host
--- 2/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@@ -48,12 -53,13 +48,12 @@@ subcommands
   publish-key (p)                     publish server host key to keyserver
  
   expert
-   import-key (i) [NAME[:PORT]]       import existing ssh key to gpg
+   import-key (i)  NAME[:PORT]        import existing ssh key to gpg
     --keyfile (-f) FILE                 key file to import
     --expire (-e) EXPIRE                date to expire
-   gen-key (g) [NAME[:PORT]]          generate gpg key for the host
+   gen-key (g) NAME[:PORT]            generate gpg key for the host
     --length (-l) BITS                  key length in bits (2048)
     --expire (-e) EXPIRE                date to expire
 -   --revoker (-r) FINGERPRINT          add a revoker
    diagnostics (d)                    monkeysphere host status
  
   version (v)                         show version number

diff --cc src/subcommands/mh/gen-key
Simple merge

diff --cc src/subcommands/mh/import-key
Simple merge