Changes to 'master'

[Jeroen van Meeuwen]

New branch 'master' available with the following commits:
commit f366701606520b944b9bc028fedf3ec5b91996cd
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue May 24 23:09:05 2011 +0200

    remove now unused dist_conf LDAPD

commit b5ded2abeea2106d708756a6b2da5104f29f142d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Feb 22 12:50:10 2011 +0000

    perl-Kolab does not handle nested if/else/endif very well, either causing the template to be terminated at 'moduleload' or to incorrectly include the TLS configuration during bootstrap.
    
    Fixes issue4708, bug #49.

commit 84d74bbbf404229e8d5c3619e45b4e3beb0a1f38
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jan 17 11:12:17 2011 +0000

    Revert "Make sure the service we reload is effectively @@@webserver_pkg@@@"
    
    This reverts commit fcc8c7d707a621687f49a7cb05c63207795e9d63.
    
    This commit didn't make any sense while not just the template was in fact spot on accurate while kolabsrv had been updated as well

commit e68c18dea814725bc2862e660b7007ff59e5c79d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jan 17 11:01:33 2011 +0000

    Make sure the service we reload is effectively @@@webserver_pkg@@@

commit 08447b048339403efe8fa660cc0270c10d5ce8bb
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jan 14 01:18:46 2011 +0000

    Add dist_conf for fedora/redhat