Backport r961616 by tmcguire from trunk to the 4.2 branch:
Backport r961616 by tmcguire from trunk to the 4.2 branch:

Merged revisions 959963 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r959963 | winterz | 2009-04-27 18:44:57 +0200 (Mon, 27 Apr 2009) | 9 lines
  
  Merged revisions 958187 via svnmerge from 
  https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
  
  ........
    r958187 | mlaurent | 2009-04-23 09:50:47 -0400 (Thu, 23 Apr 2009) | 2 lines
    
    not necessary to try to import address when we didn't select address
  ........
................


svn path=/branches/KDE/4.2/kdepim/; revision=964286

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