merge r1014915 | vkrause | 2009-08-24 04:57:14 -0400 (Mon, 24 Aug 2009)

Unbreak LDAP completion.

This reverts revisions 951431 and 951433 and adds a different fix for
Kolab issue 1996 instead.

Kolab issue 3359

svn path=/tags/kdepim/enterprise35.0.20090814.1011410/kdepim/; revision=1015059