Merge from alioth

diff --combined debian/install
index a3cca0f,50577ee..9758639
--- 1/debian/install
--- 2/debian/install
+++ b/debian/install
@@@ -1,6 -1,7 +1,7 @@@
  userdir_ldap.pth usr/share/python-support/
  userdir_ldap.py usr/share/python-support/userdir_ldap/
  userdir_gpg.py usr/share/python-support/userdir_ldap/
+ ud-config usr/bin
  ud-forwardlist usr/bin
  ud-gpgimport usr/bin
  ud-info usr/bin
@@@ -21,5 -22,5 +22,5 @@@ ud-roleadd usr/bi
  sigcheck usr/bin
  userdir-ldap.conf etc/userdir-ldap/
  generate.conf etc/userdir-ldap/
 -templates/ etc/userdir-ldap/templates/
 +templates/ etc/userdir-ldap/
  userdir-ldap.schema etc/ldap/schema/