Merged revisions 1143729-1143730,1143796 via svnmerge from 
svn+ssh://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1143729 | tilladam | 2010-06-28 18:15:12 +0200 (Mon, 28 Jun 2010) | 1 line
  
  Use a more sensible ETM.
................
  r1143730 | tilladam | 2010-06-28 18:15:16 +0200 (Mon, 28 Jun 2010) | 1 line
  
  Use a proxy that makes us crash.
................
  r1143796 | winterz | 2010-06-28 19:50:21 +0200 (Mon, 28 Jun 2010) | 9 lines
  
  SVN_SILENT:
  Blocked revisions 1143686 via svnmerge
  
  ........
    r1143686 | ludwigreiter | 2010-06-28 09:32:32 -0400 (Mon, 28 Jun 2010) | 1 line
    
    update after test of newslog 2010-06-25
  ........
................

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