Merge from alioth

diff --combined debian/changelog
index 7ad7d5a,b02e0eb..2fb18fe
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -21,10 -21,6 +21,10 @@@ userdir-ldap (0.3.15+xxx) XXunstable; u
    * ud-generate: Set shadow expiry to 1 for locked accounts [mhy].
    * update doc/slapd-config.txt: labeledURL was removed from the schema but
      not the slapd.conf example.  Do that now [mhy].
 +  * ud-generate: Mark that no passwords are exported also in the
 +    generated passwd file, not only in the shadow file (by using a "*"
 +    as password (meaning "no password"), instead of "x" (meaning "do I
 +    look like a passwd from the nineties? Look into /etc/shadow!")) [HE].
  
    [ Mark Hymers ]
    * ud-userimport, ud-groupadd, ud-roleadd, ud-useradd, userdir_ldap.py:
@@@ -34,8 -30,6 +34,8 @@@
      filename
    * Remove use of deprecated functions from the string module
    * ud-arbimport: os.exit -> sys.exit
 +  * add simple ud-config script for use in shell scripts.  This allows
 +    querying config values.
  
    [ Marc 'HE' Brockschmidt ]
    * Make the host ud-replicate syncs from configurable in userdir-ldap.conf,
@@@ -44,7 -38,10 +44,10 @@@
      the db host doesn't need to have a key in the authorized_keys file
      for the sshdist user
  
-  -- Marc 'HE' Brockschmidt <he@debian.org>  Thu, 27 Dec 2007 17:14:51 +0100
+   [ Joerg Jaspert ]
+   * Enhance copyright file a bit, also adding a pointer to our repository
+ 
+  -- Joerg Jaspert <joerg@debian.org>  Fri, 28 Dec 2007 16:29:35 +0100
  
  userdir-ldap (0.3.15) unstable; urgency=low