SVN_MERGE

Merged revisions 1038969,1039000 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........
  r1038969 | skelly | 2009-10-22 14:09:42 +0200 (Thu, 22 Oct 2009) | 3 lines
  
  Don't confuse observing QSortFilterProxyModels.
  
  Emit the correct signal form dataChanged.
........
  r1039000 | tnyblom | 2009-10-22 15:35:47 +0200 (Thu, 22 Oct 2009) | 4 lines
  
  Fix errormessages
  
  BUG: 211019
........

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