Merge commit 'micah/master'

diff --cc src/monkeysphere-authentication
index bd8e54050501a7c9a08e4fe0876025a67b29933b,d7ec40f0bb6610a57e3f3341b657bcf58b32abfb..56a8877d4293bf811fe7833c681ed8506ae2dcc8
--- 1/src/monkeysphere-authentication
--- 2/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@@ -3,16 -3,15 +3,17 @@@
  # monkeysphere-authentication: Monkeysphere authentication admin tool
  #
  # The monkeysphere scripts are written by:
 -# Jameson Rollins <jrollins@fifthhorseman.net>
 +# Jameson Rollins <jrollins@finestructure.net>
  # Jamie McClelland <jm@mayfirst.org>
  # Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+ # Micah Anderson <micah@riseup.net>
  #
- # They are Copyright 2008, and are all released under the GPL, version 3
- # or later.
+ # They are Copyright 2008-2009, and are all released under the GPL,
+ # version 3 or later.
  
  ########################################################################
 +set -e
 +
  PGRM=$(basename $0)
  
  SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}