SVN_MERGE Merged revisions 1029749,1030448 via svnmerge from  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
SVN_MERGE
Merged revisions 1029749,1030448 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r1029749 | tmcguire | 2009-09-30 18:46:48 +0200 (Wed, 30 Sep 2009) | 3 lines
  
  Report the object class again, so we again detect distribution lists and can add domain names
  to the entries, for the email address.
........
  r1030448 | tmcguire | 2009-10-02 12:06:40 +0200 (Fri, 02 Oct 2009) | 1 line
  
  No need to add the object class here, that is done in setAttrs() already.
........

svn path=/trunk/KDE/kdepim/; revision=1033251

lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi,lefou/kdepim-noakonadi