Backport r866411 by tmcguire from trunk to the 4.1 branch:
Backport r866411 by tmcguire from trunk to the 4.1 branch:

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

........
  r861561 | ervin | 2008-09-16 14:58:40 +0200 (Tue, 16 Sep 2008) | 5 lines
  
  When we load an alarm from kolab resource force its type to Display,
  otherwise it gets marked as invalid.
  
  Fixes kolab/issue2989.
........


svn path=/branches/KDE/4.1/kdepim/; revision=870435

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