Merged revisions 1142576-1142577,1142589,1142591,1142596-1142599,1142634 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1142576 | vkrause | 2010-06-25 10:04:17 +0200 (Fri, 25 Jun 2010) | 2 lines
  
  d'oh
................
  r1142577 | tmcguire | 2010-06-25 10:06:03 +0200 (Fri, 25 Jun 2010) | 5 lines
  
  Don't crash when pasting.
  
  It was causing a stack overflow, as notify() went back to slotPaste()
  eventually.
  No idea why it worked before (or why the Copy action still works)
................
  r1142589 | tmcguire | 2010-06-25 10:28:30 +0200 (Fri, 25 Jun 2010) | 12 lines
  
  SVN_SILENT:
  Blocked revisions 1109570 via svnmerge
  
  ........
    r1109570 | winterz | 2010-03-31 15:32:17 +0200 (Wed, 31 Mar 2010) | 7 lines
    
    backport SVN commit 1108753 by tokoe fro trunk
    
    Increment the clientIndex variable to insert it into
    the right completion resource.
  ........
................
  r1142591 | tmcguire | 2010-06-25 10:44:15 +0200 (Fri, 25 Jun 2010) | 17 lines
  
  SVN_MERGE:
  Merged revisions 1117455 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ........
    r1117455 | mutz | 2010-04-22 11:17:53 +0200 (Thu, 22 Apr 2010) | 8 lines
    
    TaskCollection: call calculateAndEmitProgress() also from taskStarted()
    
    This kicks off the progressbar's Kinght-Rider Mode right away
    instead of waiting for the first progress token from the backend
    (which never comes in the gpgsm case, as gpgsm doesn't seem to
    report any progress at all).
    
    Fixes kolab/issue4123 (gpg4win2).
  ........
................
  r1142596 | tmcguire | 2010-06-25 10:48:00 +0200 (Fri, 25 Jun 2010) | 10 lines
  
  SVN_MERGE:
  Merged revisions 1118259 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ........
    r1118259 | mutz | 2010-04-24 09:16:23 +0200 (Sat, 24 Apr 2010) | 1 line
    
    VerifyChecksumsController, CreateChecksumsController: adjust parse_sum_file to allow 'funny' failenames (GNU-style escaping)
  ........
................
  r1142597 | tmcguire | 2010-06-25 10:49:51 +0200 (Fri, 25 Jun 2010) | 10 lines
  
  SVN_MERGE:
  Merged revisions 1118260 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ........
    r1118260 | mutz | 2010-04-24 09:16:26 +0200 (Sat, 24 Apr 2010) | 1 line
    
    CreateChecksumsController, VerifyChecksumsController: fix regex used to parse lines in parse_sum_file()
  ........
................
  r1142598 | tmcguire | 2010-06-25 10:51:53 +0200 (Fri, 25 Jun 2010) | 10 lines
  
  SVN_MERGE:
  Merged revisions 1118261 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ........
    r1118261 | mutz | 2010-04-24 09:16:28 +0200 (Sat, 24 Apr 2010) | 1 line
    
    VerifyChecksumsController: parse output when filenames contain newlines, too
  ........
................
  r1142599 | tmcguire | 2010-06-25 10:53:38 +0200 (Fri, 25 Jun 2010) | 12 lines
  
  SVN_MERGE:
  Merged revisions 1118262 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ........
    r1118262 | mutz | 2010-04-24 09:16:30 +0200 (Sat, 24 Apr 2010) | 3 lines
    
    CreateChecksumsController, VerifyChecksumsController: at least on Unix, CR isn't escaped.
    
    I hope our sha1sum port will behave the same.
  ........
................
  r1142634 | mlaurent | 2010-06-25 11:16:07 +0200 (Fri, 25 Jun 2010) | 2 lines
  
  Fix update menu when we select collection in "favorite collection"
................

svn path=/branches/work/komo/kdepim/; revision=1142642