Merge commit 'dkg/master'

diff --cc src/share/common
index 31f8ddd08a0cbba9f633be7576a24c836a9e58c5,b45363a326af171e2c0908c7e931148ed5781a64..9630bf9adbb2827100c0a7a33f3c9e01e660fcdf
--- 1/src/share/common
--- 2/src/share/common
+++ b/src/share/common
@@@ -21,23 -21,8 +21,23 @@@ SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDI
  export SYSCONFIGDIR
  
  # monkeysphere version
- VERSION=__VERSION__
+ VERSION=0.23~pre
  
 +# default log level
 +LOG_LEVEL="INFO"
 +
 +# default keyserver
 +KEYSERVER="pool.sks-keyservers.net"
 +
 +# whether or not to check keyservers by defaul
 +CHECK_KEYSERVER="true"
 +
 +# default monkeysphere user
 +MONKEYSPHERE_USER="monkeysphere"
 +
 +# default about whether or not to prompt
 +PROMPT="true"
 +
  ########################################################################
  ### UTILITY FUNCTIONS