Merge changes back in

diff --cc debian/changelog
index 0c2f565,3de75b7..469cbf7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,15 +1,23 @@@
 -userdir-ldap (0.3.66) unstable; urgency=low
 +userdir-ldap (0.3.66+XX) unstable; urgency=low
  
 +  * ud-replicate no longer uses localsyncon=*samosa*.
+   * ud-generate cleanup:
+     - general code tidy (whitespace, semi-colons, python idioms)
+     - loop cleanup, so that fewer redundant checks are done
+     - split groups up so mail is only handled for gid Debian
+     - Stop exporting information about retired developers
+     - Stop exporting locked accounts
+     - begin cleanup of use of string exceptions
  
-  -- Peter Palfrader <weasel@debian.org>  Thu, 07 May 2009 23:41:35 +0200
+  -- Stephen Gran <sgran@debian.org>  Sat, 09 May 2009 16:41:36 +0100
  
 +userdir-ldap (0.3.66) unstable; urgency=low
 +
 +  * We would previously ignore purpose hosts for ssh known hosts purposes
 +    if the service name would not start the purpose field.  Fix this.
 +
 + -- Peter Palfrader <weasel@debian.org>  Fri, 01 May 2009 17:10:05 +0200
 +
  userdir-ldap (0.3.65) unstable; urgency=low
  
    * userdir-ldap.conf: remove from default keyrings:

diff --cc ud-generate
index b4ae223,4e627e8..18e4c6e
--- 1/ud-generate
--- 2/ud-generate
+++ b/ud-generate
@@@ -40,9 -44,9 +44,9 @@@ CurrentHost = "
  
  UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
  
- EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
- BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL);
+ EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$")
+ BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL)
 -PurposeHostField = re.compile(r"\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
 +PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
  DNSZone = ".debian.net"
  Keyrings = ConfModule.sync_keyrings.split(":")