Merge from alioth

diff --cc debian/changelog
index 4219b3f,301da9a..0459844
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -32,10 -18,10 +32,12 @@@ userdir-ldap (0.3.15+xxx) XXunstable; u
      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
++  * add simple ud-config script for use in shell scripts.  This allows
++    querying config values.
  
-  -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:32:16 +0100
 - -- Mark Hymers <mhy@debian.org>  Wed, 26 Dec 2007 20:54:28 +0000
++ -- Peter Palfrader <weasel@debian.org>  Thu, 10 Jan 2008 15:34:46 +0100
  
  userdir-ldap (0.3.15) unstable; urgency=low