SVN_MERGE

Merged revisions 1031459,1031484,1031491,1031566,1031810 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

................
  r1031459 | skelly | 2009-10-05 10:46:33 +0200 (Mon, 05 Oct 2009) | 1 line
  
  Move this to the correct method.
................
  r1031484 | osterfeld | 2009-10-05 11:31:17 +0200 (Mon, 05 Oct 2009) | 2 lines
  
  make sure transportbase.h is generated before the test is built
................
  r1031491 | vkrause | 2009-10-05 11:47:34 +0200 (Mon, 05 Oct 2009) | 11 lines
  
  SVN_MERGE
  
  Recorded merge of revisions 1031228 via svnmerge from 
  https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepim
  
  ........
    r1031228 | mlaurent | 2009-10-04 15:00:43 +0200 (Sun, 04 Oct 2009) | 2 lines
    
    not necessary
  ........
................
  r1031566 | ervin | 2009-10-05 15:10:09 +0200 (Mon, 05 Oct 2009) | 5 lines
  
  Also catch the server greeting in the session so that we can check it
  later. Useful for some server detection.
  
  CCBUG: 204653
................
  r1031810 | tokoe | 2009-10-06 09:25:51 +0200 (Tue, 06 Oct 2009) | 2 lines
  
  Fix i18n cataloges
................

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1031817