Merge from alioth

diff --combined debian/changelog
index ff11fb8,d2071e6..aea77b4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -24,8 -24,6 +24,8 @@@ userdir-ldap (0.3.15+xxx) XXunstable; u
    * ud-generate: Set shadow expiry to 1 for locked accounts.
    * update doc/slapd-config.txt: labeledURL was removed from the schema but
      not the slapd.conf example.  Do that now.
 +  * 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,
@@@ -38,13 -36,12 +38,16 @@@
      debianServer schema and teach ud-host about it
    * ud-host: cleanup: Replace local copy HBaseDn of the centrally
      configured HostBaseDn.
 +  * 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!")).
  
    [ Joerg Jaspert ]
    * Enhance copyright file a bit, also adding a pointer to our repository
+   * Add those utf8 headerlines to mail templates. Same "trick" as used in dak
+     to send utf8 mails for people that need them. Works there - should work
+     here too.
  
    [ Stephen Gran ]
    * ud-fingerserv: implement daemonize() for non-inetd mode.