Merge from alioth

diff --combined debian/changelog
index fe0176e,301da9a..4219b3f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -11,16 -11,6 +11,20 @@@ userdir-ldap (0.3.15+xxx) XXunstable; u
    * Change the build dependency on python-support to be versioned >= 0.3.
    * ud-roleadd: Do not try to make role accounts of objectClass
      inetOrgPerson, that doesn't work.
 +  * ud-fingerserv: implement daemonize() for non-inetd mode [sgran].
 +  * ud-useradd: support usergroups [HE].
 +  * ud-host/userdir-ldap.schema: Add 'purpose', 'physicalHost' to
 +    debianServer schema and teach ud-host about [HE].
 +  * ud-host: cleanup: Replace local copy HBaseDn of the centrally
 +    configured HostBaseDn [HE].
 +  * Add myself to uploaders.
 +  * 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:
@@@ -28,10 -18,10 +32,10 @@@
      ud-{user,group,role}add and abstract them out into userdir_ldap.py
    * ud-useradd: Avoid a TypeError exception when constructing the template
      filename
--  * Remove use of deprecated functions from the string module 
++  * Remove use of deprecated functions from the string module
    * ud-arbimport: os.exit -> sys.exit
  
-- -- Mark Hymers <mhy@debian.org>  Wed, 26 Dec 2007 20:54:28 +0000
++ -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:32:16 +0100
  
  userdir-ldap (0.3.15) unstable; urgency=low