Merge commit 'dkg/master'

Conflicts:

	src/share/ma/setup

diff --cc src/share/ma/setup
index 216b0b903f4208293b9afc010a9c6e5812a759eb,8032023cd6fa9c789c0e8889dcab8e079fa706d6..f989db6e41c326bf74f189140a7effa1ed94c28f
--- 1/src/share/ma/setup
--- 2/src/share/ma/setup
+++ b/src/share/ma/setup
@@@ -97,11 -96,11 +96,11 @@@ EO
      # ensure that we're using the extended trust model (1), and that
      # our preferences are reasonable (i.e. 3 marginal OR 1 fully
      # trusted certifications are sufficient to grant full validity.
-     log debug "checking trust level of core key..."
+     log debug "checking trust model for authentication ..."
 -    local TRUST_MODEL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
 +    local TRUST_LEVEL=$(gpg_sphere "--with-colons --fixed-list-mode --list-keys" \
        | head -n1 | grep "^tru:" | cut -d: -f3,6,7)
-     log debug "sphere trust level of core: $TRUST_LEVEL"
-     if [ "$TRUST_LEVEL" != '1:3:1' ] ; then
+     log debug "sphere trust model: $TRUST_MODEL"
+     if [ "$TRUST_MODEL" != '1:3:1' ] ; then
        failure "monkeysphere-authentication does not have the expected trust model settings."
      fi
  }