Merge branch 'master' of git://lair.fifthhorseman.net/~dkg/keyringer

Conflicts:

	keyringer

diff --cc keyringer
index ebd533873e8cb4ee80a62b6ee6181cfd6712602f,c08a897b2f6322638fd3a962c92dc1df637f6851..28936832c100ae95c1726048232a2241a0fbccc0
--- 1/keyringer
--- 2/keyringer
+++ b/keyringer
@@@ -134,8 -134,8 +134,8 @@@ ACTIONS="`dirname $(readlink -f $0)`/sh
  export PREFERENCES="`dirname $CONFIG`/$KEYRING"
  
  # Load functions
- LIB="`dirname $0`/lib/$NAME/functions"
- source $LIB || exit 1
+ LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions"
 -source "$LIB"
++source "$LIB" | exit 1
  
  # Setup main configuration and load preferences
  keyringer_config_load